margin change

heyujie

2021-11-05 9f633a2aff6cde941dd1293a57eb14e971e5ba13

margin change

 src/pages/shuohuangMonitorAnalyze/components/configManage.vue

@@ -113,9 +113,10 @@
<style lang="scss">
.config-manage {
  padding: 28px 33px;
  margin: 27px;
  background: #fff;
  box-shadow: 0px 3px 6px rgba(160, 174, 230, 0.56);
  height: 100%;
  border-radius: 10px;
  .el-collapse {
    border-top: none;
    border-bottom: none;
@@ -172,7 +173,11 @@
    padding-top: 20px;
    .el-button {
      padding: 9px 42px;
      background-color: #2d52d7;
      font-size: 13px;
      span {
        color: #fff;
      }
    }
  }
}

 src/pages/shuohuangMonitorAnalyze/components/memberManage.vue

@@ -116,7 +116,9 @@
          <el-table-column label="用户权限" prop="userpermission">
            <template slot-scope="scope">
              <div>
                <el-switch active-color="#4B72E2" inactive-color="#B7BEC8"
                <el-switch
                  active-color="#4B72E2"
                  inactive-color="#B7BEC8"
                  v-model="scope.row.UserPermissions"
                  @change="memberUpdate(scope.row)"
                ></el-switch>
@@ -126,7 +128,9 @@
          <el-table-column label="转储权限" prop="transferpermission">
            <template slot-scope="scope">
              <div>
                <el-switch active-color="#4B72E2" inactive-color="#B7BEC8"
                <el-switch
                  active-color="#4B72E2"
                  inactive-color="#B7BEC8"
                  v-model="scope.row.DumpPermissions"
                  @change="memberUpdate(scope.row)"
                ></el-switch>
@@ -136,8 +140,12 @@
          <el-table-column label="操作">
            <template slot-scope="scope">
              <div class="operation">
                <i class="el-icon-edit" @click="editMember(scope.row)"></i>
                <i class="el-icon-delete" @click="delMember(scope.row)"></i>
                <div class="edit" @click="editMember(scope.row)">
                  <span class="icon iconfont">&#xe79d;</span>
                </div>
                <div class="delete" @click="delMember(scope.row)">
                  <span class="icon iconfont">&#xe79e;</span>
                </div>
              </div>
            </template>
          </el-table-column>
@@ -637,11 +645,13 @@

<style lang="scss">
.member-manage {
  padding: 20px;
  padding: 25px;
  background: #fff;
  margin: 33px;
  // margin: 33px;
  display: flex;
  box-sizing: border-box;
  box-sizing: border-box;box-shadow: 0px 3px 6px rgba(160, 174, 230, 0.56);
  
border-radius: 10px;
  .left {
    .el-tree--highlight-current
      .el-tree-node.is-current
@@ -792,6 +802,9 @@
      .keyword-input {
        width: 320px;
      }
      button span {
        color: #fff;
      }
      .reset-btn {
        background-color: #a6b5cb !important;
        border-color: #a6b5cb !important;
@@ -804,11 +817,42 @@
        padding: 8px 12px;
      }
    }

    .table-area {
      .actions {
        text-align: right;
        button span {
          color: #fff;
        }
      }

      .operation {
        .edit {
          background: #dea60b;
          width: 23px;
          height: 23px;
          text-align: center;
          border-radius: 23px;
          line-height: 21px;
          margin-right: 10px;
          span {
            color: #fff;
            font-size: 12px;
          }
        }
        .delete {
           background: #D94141;
          width: 23px;
          height: 23px;
          text-align: center;
          border-radius: 23px;
          line-height: 22px;
          margin-right: 10px;
          span {
            color: #fff;
            font-size: 12px;
          }
        }
      }
      .el-table td.el-table__cell div {
        color: #425277;
      }
@@ -824,6 +868,9 @@
      .el-table .el-table__cell {
        padding: 7.5px 0;
      }
      .el-table th.el-table__cell > .cell {
        color: #fff;
      }
    }
  }
}

 src/pages/shuohuangMonitorAnalyze/components/searchForVideoAnalyze.vue

@@ -261,11 +261,12 @@
                      v-for="(label, index) in data.LableLst"
                      :key="index"
                    >
                      {{
                        label.Desc +
                        (index == data.LableLst.length - 1 ? "" : "，")
                      }}
                      {{ label.Desc }}
                    </span>
                    <!-- (index == data.LableLst.length - 1 ? "" : "，") -->
                  </div>
                  <div v-else-if="hasError(data)" class="has-error">
                    <span>有异常</span>
                  </div>
                  <div v-else class="no-error">
                    <span>无异常</span>
@@ -601,7 +602,7 @@
          _this.tabData = _this.tabData.map(function (item) {
            const set = new Set();
            item.LableLst.forEach(function (label) {
              label.Desc.split("，").forEach(function (d) {
              label.Desc.split(",").forEach(function (d) {
                set.add(d);
              });
            });
@@ -658,7 +659,7 @@
          _this.tabData = _this.tabData.map(function (item) {
            const set = new Set();
            item.LableLst.forEach(function (label) {
              label.Desc.split("，").forEach(function (d) {
              label.Desc.split(",").forEach(function (d) {
                set.add(d);
              });
            });
@@ -705,6 +706,13 @@
          });
        });
      });
    },
    hasError(data) {
      if (!data.EventLst || data.EventLst.length == 0) {
        return false;
      }
      const t = data.EventLst.some((x) => x.state == 0);
      return t && data.IsOperate == "1";
    },
    toggleFollow(data) {
      data.IsFollow == "0" ? (data.IsFollow = "1") : (data.IsFollow = "0");
@@ -885,6 +893,8 @@
.search-for-video-analyze {
  background-color: #f4f6f9;
  margin: 0 5px;
  margin-bottom: 10px;

  * {
    box-sizing: content-box;
  }
@@ -1157,6 +1167,7 @@
            font-size: 18px;
            padding: 2px 4px 0px 4px;
            border-radius: 4px;
            cursor: pointer;
            &.menu {
              margin-right: 10px;
              span {
@@ -1167,7 +1178,7 @@
              span {
                color: #fff;
              }
              background-color: #2D52D7;
              background-color: #2d52d7;
            }
          }
        }
@@ -1178,11 +1189,13 @@
      .el-table__row {
        cursor: pointer;
      }
      .el-table {
        border: none;
      }
      .el-col {
        margin-bottom: 10px;
      }
      .card {
        cursor: pointer;
        position: relative;
        text-align: left;
        background: #fff;
@@ -1194,6 +1207,7 @@
          box-shadow: 3px 3px 4px #d3def2;
        }
        .video-wrap {
          cursor: pointer;
          border-radius: 3px;
          width: 100%;
          padding-top: 56.25%;
@@ -1214,32 +1228,61 @@
              margin-bottom: 1px;
            }
            label {
              color: #999;
              color: #808dab;
              padding-right: 8px;
              line-height: 16px;
            }
            span {
              font-weight: bold;
              color: #425277;
              line-height: 16px;
            }
          }
          .mark-info {
            margin: 10px 0;
            color: #3d68e1;
            .abnormal {
              color: red;
              overflow: hidden;
              text-overflow: ellipsis;
              white-space: nowrap;
              .abnormal-label {
                display: inline-block;
                border: 1px solid;
                border: 1px solid #bf3a3a;
                border-radius: 2px;
                color: #bf3a3a;
                padding: 0 3px;
                margin-right: 3px;
              }
            }
            .event-tag {
              margin-top: 10px;
              margin-top: 8px;
              .el-tag.el-tag--info {
                background-color: #96a0b7;
                border-color: #96a0b7;
                color: #fff;
                cursor: pointer;
                height: 19px;
                padding: 0 5px;
              }
            }
            .no-error{
            .has-error {
              width: fit-content;
    background: #2D52D7;
    padding: 1px 5px
;
    border-radius: 2px
;
span{
  color: #fff;
}
              background: #bf3a3a;
              padding: 1px 5px;
              border-radius: 2px;
              span {
                color: #fff;
              }
            }
            .no-error {
              width: fit-content;
              background: #2d52d7;
              padding: 1px 5px;
              border-radius: 2px;
              span {
                color: #fff;
              }
            }
          }
          .tag-info {
@@ -1258,11 +1301,11 @@
          font-size: 20px;
          right: 10px;
          bottom: 10px;
          i{
            color: #C7D0E5;
          i {
            color: #c7d0e5;
          }
          .follow {
            color: #F90741;
            color: #f90741;
          }
        }
      }

 src/pages/shuohuangMonitorAnalyze/components/taskManage.vue

@@ -444,8 +444,16 @@

<style lang="scss">
.tab-task-manage {
  padding: 0 30px;

  // padding: 0 30px;
  .el-collapse-item__content {
    padding: 10px 32px;
  }
  button span {
    color: #fff;
  }
  button i {
    color: #fff;
  }
  .partment {
    border: 1px solid #e8e8e8;
    border-radius: 3px;
@@ -459,9 +467,7 @@
      float: right;
    }
  }
  .body {
    // padding: 14px 20px 20px;
  }

  .flex-box {
    align-items: center;
    & > label {
@@ -528,6 +534,17 @@
            color: #888;
          }
        }
      }
      .video-list::-webkit-scrollbar {
        width: 8px;
      }
      .video-list::-webkit-scrollbar-thumb {
        border-radius: 5px;
        // box-shadow: 0px 3px 6px rgba(23, 37, 233, 0.43);
        background-color: #eaecf8;
      }
      .video-list::-webkit-scrollbar-track {
        background-color: #cad5e6;
      }
    }
    .top-right {
@@ -600,12 +617,13 @@
    background: #f5f5f5;
  }
  .bot-box {
    height: 450px;
    background: #ffffff;
    box-shadow: 0px 3px 6px rgba(160, 174, 230, 0.56);
    opacity: 1;
    border-radius: 10px;
    box-sizing: border-box;
    padding-bottom: 30px;

    .header {
      display: flex;
      height: 60px;
@@ -648,6 +666,12 @@
          padding: 0;
          height: 50px;
        }
        .el-table__expanded-cell {
          padding-left: 65px;
        }
        th.el-table__cell > .cell {
          color: #fff;
        }
      }
    }
    .actions {

 src/pages/shuohuangMonitorAnalyze/components/transferMemo.vue

@@ -214,11 +214,15 @@
.transfer-memo {
  padding: 33px;
  background-color: #fff;
  margin: 31px;    height: 100%;
    height: 100%;

box-shadow: 0px 3px 6px rgba(160, 174, 230, 0.56);
  .table-area .el-table {
    border: none;
  }
  .el-table th.el-table__cell > .cell {
    color: #fff;
}
  .btns {
    .reset-btn {
      background-color: #a6b5cb !important;
@@ -227,6 +231,9 @@
    .query-btn {
      background-color: #2d52d7 !important;
    }
    button span {
      color: #fff;
    }
  }
  .flex-box {
    margin-bottom: 23px;

 src/pages/shuohuangMonitorAnalyze/index/App.vue

@@ -11,12 +11,12 @@
        <top-nav></top-nav>
      </div>

      <el-breadcrumb separator-class="el-icon-arrow-right">
      <!-- <el-breadcrumb separator-class="el-icon-arrow-right">
        <el-breadcrumb-item>{{ breadcrumb }}</el-breadcrumb-item>
        <el-breadcrumb-item v-if="breadcrumb2">{{
          breadcrumb2
        }}</el-breadcrumb-item>
      </el-breadcrumb>
      </el-breadcrumb> -->

      <div class="container">
        <!-- 首页 -->
@@ -240,10 +240,12 @@
      margin: 25px 0 25px 30px;
    }
    .container {
      margin: 0px 0 0 30px;
      margin: 0 0 0 30px;
      padding: 30px 0;

      padding-right: 30px;
      box-sizing: border-box;
      height: calc(100vh - 84px);
      height: calc(100vh - 58px);
      overflow-y: auto;
    }
  }

 src/pages/systemSettings/views/NetSettings.vue

@@ -323,7 +323,7 @@
  getDevInfo,

} from "@/api/system";



import cloudNode from "../components/CloudNode";

// import cloudNode from "../components/CloudNode";

import ipInput from "@/components/subComponents/IPInput";

import { isIPv4 } from "@/scripts/validate";

import switchBar from "../components/switchBar";

@@ -396,7 +396,7 @@
    };

  },

  components: {

    cloudNode,

    // cloudNode,

    ipInput,

    switchBar,

  },


 vue.config.js

@@ -41,7 +41,7 @@
})

// const serverUrl = "http://58.118.225.79:41243" // 羊五
const serverUrl = "http://192.168.8.117:7003"
const serverUrl = "http://192.168.20.117:7009"

module.exports = {
  pages,