修改

dsk-operate-ui/src/views/monitoring/EnterpriseMonitoring.vue

@@ -166,7 +166,7 @@
           }
         ],
         jkVisible:false,
-        qyVisible:true,
+        qyVisible:false,
         pldrVisible:false,
       }
     },
@@ -184,7 +184,6 @@
 
 <style lang="scss" scoped>
   .EnterpriseMonitoring{
-    padding: 0px 16px;
     .header{
       background: #FFFFFF;
       padding: 25px 16px;

dsk-operate-ui/src/views/monitoring/MonitorSettings.vue

 <template>
   <!--监控维度设置-->
     <div class="app-container MonitorSettings">
-      <div class="m-title">监控维度设置</div>
-      <div class="m-main">
-        <div class="main-item">
-          <div class="label">风险类型</div>
-          <div class="main-right">
-            <div class="checkbox">
-              <div class="checkbox-content-qx">
-                <el-checkbox v-model="checkFx" @change="checkFxBtn">全部</el-checkbox>
+      <div class="content">
+        <div class="m-title">监控维度设置</div>
+        <div class="m-main">
+          <div class="main-item">
+            <div class="label">风险类型</div>
+            <div class="main-right">
+              <div class="checkbox">
+                <div class="checkbox-content-qx">
+                  <el-checkbox v-model="checkFx" @change="checkFxBtn">全部</el-checkbox>
+                </div>
+                <el-checkbox-group v-model="queryParams.fxType" class="keyword_checkbox" @change="checkFx1Btn">
+                  <el-checkbox v-for="item in fxlx" :label="item.value" :key="item.label">{{item.label}}</el-checkbox>
+                </el-checkbox-group>
               </div>
-              <el-checkbox-group v-model="queryParams.fxType" class="keyword_checkbox" @change="checkFx1Btn">
-                <el-checkbox v-for="item in fxlx" :label="item.value" :key="item.label">{{item.label}}</el-checkbox>
-              </el-checkbox-group>
             </div>
           </div>
-        </div>
-        <div class="main-item">
-          <div class="label">监控维度</div>
-          <div class="main-right">
-            <div class="checkbox">
-              <div class="checkbox-content-qx">
-                <el-checkbox v-model="checkJkwd" @change="checkJkwdBtn">全部</el-checkbox>
+          <div class="main-item">
+            <div class="label">监控维度</div>
+            <div class="main-right">
+              <div class="checkbox">
+                <div class="checkbox-content-qx">
+                  <el-checkbox v-model="checkJkwd" @change="checkJkwdBtn">全部</el-checkbox>
+                </div>
+                <el-checkbox-group v-model="queryParams.jkwdType" class="keyword_checkbox" @change="checkJkwd1Btn">
+                  <el-checkbox v-for="item in jkwd" :label="item.value" :key="item.label">{{item.label}}</el-checkbox>
+                </el-checkbox-group>
               </div>
-              <el-checkbox-group v-model="queryParams.jkwdType" class="keyword_checkbox" @change="checkJkwd1Btn">
-                <el-checkbox v-for="item in jkwd" :label="item.value" :key="item.label">{{item.label}}</el-checkbox>
-              </el-checkbox-group>
             </div>
           </div>
         </div>
-      </div>
-      <div class="m-title">监控推送时间设置</div>
-      <div class="m-main">
-        <div class="main-item">
-          <div class="label">推送频率</div>
-          <el-radio v-model="queryParams.radio" label="1">每天</el-radio>
-          <el-radio v-model="queryParams.radio" label="2">工作日（排除节假日）</el-radio>
-        </div>
-        <div class="main-item" style="line-height: 32px;">
-          <div class="label">推送时段</div>
-          <el-time-picker
-            is-range
-            class="timePicker"
-            v-model="queryParams.time"
-            range-separator="至"
-            start-placeholder="开始时间"
-            end-placeholder="结束时间"
-            placeholder="选择时间范围">
-          </el-time-picker>
+        <div class="m-title">监控推送时间设置</div>
+        <div class="m-main">
+          <div class="main-item">
+            <div class="label">推送频率</div>
+            <el-radio v-model="queryParams.radio" label="1">每天</el-radio>
+            <el-radio v-model="queryParams.radio" label="2">工作日（排除节假日）</el-radio>
+          </div>
+          <div class="main-item" style="line-height: 32px;">
+            <div class="label">推送时段</div>
+            <el-time-picker
+              is-range
+              class="timePicker"
+              v-model="queryParams.time"
+              range-separator="至"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
+              placeholder="选择时间范围">
+            </el-time-picker>
+          </div>
         </div>
-      </div>
-      <div class="m-title">监控接收方式</div>
-      <div class="m-main">
-        <div class="main-item">
-          <div class="label">接收方式</div>
-          <el-radio v-model="queryParams.radio" label="1">全部</el-radio>
-          <el-radio v-model="queryParams.radio" label="2">手机短信</el-radio>
-          <el-radio v-model="queryParams.radio" label="3">PC</el-radio>
+        <div class="m-title">监控接收方式</div>
+        <div class="m-main">
+          <div class="main-item">
+            <div class="label">接收方式</div>
+            <el-radio v-model="queryParams.radio" label="1">全部</el-radio>
+            <el-radio v-model="queryParams.radio" label="2">手机短信</el-radio>
+            <el-radio v-model="queryParams.radio" label="3">PC</el-radio>
+          </div>
+          <div class="main-item" style="line-height: 32px;">
+            <div class="label">手机号码</div>
+            <el-input class="phone" v-model="queryParams.phone" placeholder="请输入手机号"></el-input>
+          </div>
         </div>
-        <div class="main-item" style="line-height: 32px;">
-          <div class="label">手机号码</div>
-          <el-input class="phone" v-model="queryParams.phone" placeholder="请输入手机号"></el-input>
+        <div class="search">
+          <span class="btn1">保存</span>
+          <span class="btn2">重置</span>
         </div>
       </div>
-      <div class="search">
-        <span class="btn1">保存</span>
-        <span class="btn2">重置</span>
-      </div>
+
     </div>
 </template>
 
@@ -121,7 +124,6 @@
       checkFxBtn(val) {
         this.queryParams.fxType = [];
         this.checkFx = true;
-        this.search();
       },
       checkFx1Btn(val){
         if (val.length > 0) {
@@ -148,8 +150,10 @@
 
 <style lang="scss" scoped>
   .MonitorSettings{
-    padding: 0px 16px;
-    background: #ffffff;
+    .content{
+      background: #ffffff;
+      padding: 16px;
+    }
     .m-title{
       border-left: 2px solid rgba(35,35,35,0.8);;
       padding-left: 8px;
@@ -158,11 +162,11 @@
       line-height: 16px;
       font-weight: 700;
       color: #232323;
-      margin-top: 16px;
       margin-bottom: 16px;
     }
     .m-main{
       border-bottom: 1px solid #EEEEEE;
+      margin-bottom: 16px;
     }
     .main-item {
       margin-bottom: 16px;

dsk-operate-ui/src/views/monitoring/MonitoringReport.vue

@@ -165,7 +165,6 @@
 
 <style lang="scss" scoped>
   .MonitoringReport{
-    padding: 0px 16px;
     /*background: #ffffff;*/
     .header{
       justify-content: space-between;
@@ -173,9 +172,9 @@
       background: #FFFFFF;
       border-radius: 4px;
       color: #232323;
-      position: sticky;
-      top: 54px;
-      z-index: 999;
+      /*position: sticky;*/
+      /*top: 54px;*/
+      /*z-index: 999;*/
       ::v-deep .el-tabs{
         height: 48px;
         line-height: 48px;