关联IP字段修改

1 week ago · 9791cc0545
parent 4dd0e04022
commit 9791cc0545
7 changed files with 15338 additions and 5976 deletions
--- a/.env.development
+++ b/.env.development
@ -5,10 +5,10 @@ VUE_APP_TITLE = 太仓市网络和数据资产采集管理系统
 ENV = 'development'

 # 若依管理系统/开发环境
-# VUE_APP_BASE_API = 'http://192.168.0.112:9115'
-VUE_APP_BASE_API = 'http://39.101.188.84:9115'
+VUE_APP_BASE_API = 'http://192.168.0.103:9115'
+# VUE_APP_BASE_API = 'http://39.101.188.84:9115'
 # VUE_APP_BASE_API = 'http://192.168.0.112:9115'


 # 路由懒加载
-VUE_CLI_BABEL_TRANSPILE_MODULES = true  
+VUE_CLI_BABEL_TRANSPILE_MODULES = true
--- a/src/assets/styles/index.scss
+++ b/src/assets/styles/index.scss
@ -1,18 +1,19 @@
-@import './variables.scss';
-@import './mixin.scss';
-@import './transition.scss';
-@import './element-ui.scss';
-@import './sidebar.scss';
-@import './btn.scss';
-@import './public.scss';
-@import './font.css';
+@import "./variables.scss";
+@import "./mixin.scss";
+@import "./transition.scss";
+@import "./element-ui.scss";
+@import "./sidebar.scss";
+@import "./btn.scss";
+@import "./public.scss";
+@import "./font.css";

 body {
  height: 100%;
  -moz-osx-font-smoothing: grayscale;
  -webkit-font-smoothing: antialiased;
  text-rendering: optimizeLegibility;
-  font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
+  font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB,
+    Microsoft YaHei, Arial, sans-serif;
 }

 label {
@ -26,7 +27,7 @@ html {

 #app {
  height: 100%;
-  background-color: #F2F4F6;
+  background-color: #f2f4f6;
 }

 *,
@ -107,7 +108,8 @@ aside {
  display: block;
  line-height: 32px;
  font-size: 16px;
-  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen,
+    Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
  color: #2c3e50;
  -webkit-font-smoothing: antialiased;
  -moz-osx-font-smoothing: grayscale;
@ -139,7 +141,7 @@ aside {
 }

 .text-center {
-  text-align: center
+  text-align: center;
 }

 .sub-navbar {
@ -150,7 +152,13 @@ aside {
  text-align: right;
  padding-right: 20px;
  transition: 600ms ease position;
-  background: linear-gradient(90deg, rgba(32, 182, 249, 1) 0%, rgba(32, 182, 249, 1) 0%, rgba(33, 120, 241, 1) 100%, rgba(33, 120, 241, 1) 100%);
+  background: linear-gradient(
+    90deg,
+    rgba(32, 182, 249, 1) 0%,
+    rgba(32, 182, 249, 1) 0%,
+    rgba(33, 120, 241, 1) 100%,
+    rgba(33, 120, 241, 1) 100%
+  );

  .subtitle {
    font-size: 20px;
--- a/src/assets/styles/public.scss
+++ b/src/assets/styles/public.scss
@ -3,7 +3,7 @@
  width: 100%;
  display: flex;
  flex-direction: column;
-  background-color: #F2F4F6;
+  background-color: #f2f4f6;

  .content-search {
    padding-top: 20px;
@ -19,7 +19,7 @@
      padding-left: 20px;
      position: relative;
      padding-bottom: 15px;
-      border-bottom: 1px solid #F2F4F6;
+      border-bottom: 1px solid #f2f4f6;

      &::before {
        content: "";
@ -30,7 +30,7 @@
        position: absolute;
        top: 0px;
        left: 0px;
-        background-color: #2F8AE5;
+        background-color: #2f8ae5;
      }
    }

@ -72,7 +72,7 @@
    .search-title {
      display: flex;
      justify-content: space-between;
-      border-bottom: 1px solid #F2F4F6;
+      border-bottom: 1px solid #f2f4f6;
      padding: 0px 10px 0px 0px;

      .search-title-span {
@ -92,7 +92,7 @@
          position: absolute;
          top: 0px;
          left: 0px;
-          background-color: #2F8AE5;
+          background-color: #2f8ae5;
        }
      }
    }
@ -115,7 +115,7 @@
        }

        .evenNumber-row {
-          background-color: #F6F9FD;
+          background-color: #f6f9fd;
        }
      }
    }
@ -176,7 +176,7 @@
      color: #192734;
      position: relative;
      padding: 15px 0 15px 20px;
-      border-bottom: 1px solid #F2F4F6;
+      border-bottom: 1px solid #f2f4f6;

      &::before {
        content: "";
@ -187,7 +187,7 @@
        position: absolute;
        top: 15px;
        left: 0px;
-        background-color: #2F8AE5;
+        background-color: #2f8ae5;
      }
    }

@ -235,7 +235,7 @@
            font-family: Alibaba PuHuiTiR;
            font-weight: 400;
            font-size: 14px;
-            color: #5C6166;
+            color: #5c6166;
          }
        }
      }
@ -263,7 +263,7 @@
      padding-left: 20px;
      position: relative;
      padding-bottom: 15px;
-      border-bottom: 1px solid #F2F4F6;
+      border-bottom: 1px solid #f2f4f6;

      &::before {
        content: "";
@ -274,7 +274,7 @@
        position: absolute;
        top: 0px;
        left: 0px;
-        background-color: #2F8AE5;
+        background-color: #2f8ae5;
      }
    }

@ -284,7 +284,7 @@

    .top-info {
      padding: 20px;
-      background: #FAFBFC;
+      background: #fafbfc;

      .top-row {
        margin-bottom: 20px;
@ -300,7 +300,7 @@
          font-family: Alibaba PuHuiTi;
          font-weight: 400;
          font-size: 14px;
-          color: #5C6166;
+          color: #5c6166;
        }
      }
    }
@ -312,7 +312,7 @@
  }

  .info-cut-off-rule {
-    border-bottom: 1px solid #F2F4F6;
+    border-bottom: 1px solid #f2f4f6;
    display: flex;
    margin-bottom: 20px;

@ -337,15 +337,15 @@

    .active-tab {
      color: #fff;
-      background-color: #1485EF;
-      border: 1px solid #1485EF;
+      background-color: #1485ef;
+      border: 1px solid #1485ef;
    }
  }

  .info-cut-off-rule-my {
    padding-top: 15px;
    padding-bottom: 15px;
-    border-bottom: 1px solid #F2F4F6;
+    border-bottom: 1px solid #f2f4f6;
    margin-bottom: 20px;

    .info-title {
@ -356,7 +356,6 @@
      padding-left: 20px;
      position: relative;

-
      &::before {
        content: "";
        display: block;
@ -366,7 +365,7 @@
        position: absolute;
        top: 0px;
        left: 0px;
-        background-color: #2F8AE5;
+        background-color: #2f8ae5;
      }
    }
  }
@ -385,7 +384,7 @@
        }

        .evenNumber-row {
-          background-color: #F6F9FD;
+          background-color: #f6f9fd;
        }
      }
    }
@ -394,7 +393,7 @@

 .audit-pages-box-two,
 .info-left-two {
-  background-color: #F2F4F6 !important;
+  background-color: #f2f4f6 !important;
  display: flex;
  flex-direction: column;

@ -417,7 +416,6 @@
    .btn-box {
      position: absolute;
      right: calc(-100% - 10px);
-
    }
  }

@ -440,19 +438,18 @@
    .top-title-box {
      font-weight: 700;
      font-size: 18px;
-      color: #3D3D3D;
+      color: #3d3d3d;
      padding-left: 30px;
    }

    .top-title-two-box {
      font-weight: 700;
      font-size: 16px;
-      color: #3D3D3D;
+      color: #3d3d3d;
      padding-left: 50px;
    }

    .assets-info-box {
-
      // padding-bottom: 100px;
      .demo-ruleForm {
        .upload-file {
@ -512,7 +509,6 @@
  }
 }

-
 input[aria-hidden="true"] {
  display: none !important;
 }
@ -524,4 +520,4 @@ input[aria-hidden="true"] {
 .bottomclass {
  text-align: center;
  background-color: #fff;
-}
+}
--- a/src/views/components/assetsType/index.vue
+++ b/src/views/components/assetsType/index.vue
--- a/src/views/components/myAssetsType/index.vue
+++ b/src/views/components/myAssetsType/index.vue
--- a/src/views/components/renwuType/webType1.vue
+++ b/src/views/components/renwuType/webType1.vue
--- a/src/views/components/renwuType/webType2DW.vue
+++ b/src/views/components/renwuType/webType2DW.vue