Merge branch 'develop' of http://gitlab.91isoft.com:90/car-test/web into develop

7e020a16 · jiaxu.yan · de8fb532 · 6a97e969 · 7e020a16 · 7e020a16
Commit 7e020a16 authored Mar 06, 2024 by jiaxu.yan
11 changed files
--- a/public/index.html
+++ b/public/index.html
 <!DOCTYPE html>
 <html>
-  <head>
+<head>
    <meta charset="utf-8">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <% if (process.env.NODE_ENV === 'production') { %>
-      <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
+    <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
    <% } %>
    <meta name="renderer" content="webkit">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
    <!-- <link href="https://unpkg.com/tailwindcss@^2/dist/tailwind.min.css" rel="stylesheet"> -->
-    <script src="https://lf1-cdn-tos.bytegoofy.com/obj/iconpark/icons_31435_45.895dadadb277cdfd9a395ce51c41d6a1.js"></script>
+    <script src="https://lf1-cdn-tos.bytegoofy.com/obj/iconpark/icons_31435_55.923da21ede831095d4d7a8ab05fe30cb.js"></script>
    <title><%= webpackConfig.name %></title>
-    <!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
+    <!--[if lt IE 11]>
-	  <style>
+    <script>window.location.href = '/html/ie.html';</script><![endif]-->
-    html,
+    <style>
-    body,
+        html,
-    #app {
+        body,
-      height: 100%;
+        #app {
-      margin: 0px;
+            height: 100%;
-      padding: 0px;
+            margin: 0px;
-    }
+            padding: 0px;
-    .chromeframe {
+        }
-      margin: 0.2em 0;
-      background: #ccc;
+        .chromeframe {
-      color: #000;
+            margin: 0.2em 0;
-      padding: 0.2em 0;
+            background: #ccc;
-    }
+            color: #000;
+            padding: 0.2em 0;
-    #loader-wrapper {
+        }
-      position: fixed;
-      top: 0;
+        #loader-wrapper {
-      left: 0;
+            position: fixed;
-      width: 100%;
+            top: 0;
-      height: 100%;
+            left: 0;
-      z-index: 999999;
+            width: 100%;
-    }
+            height: 100%;
+            z-index: 999999;
-    #loader {
+        }
-      display: block;
-      position: relative;
+        #loader {
-      left: 50%;
+            display: block;
-      top: 50%;
+            position: relative;
-      width: 150px;
+            left: 50%;
-      height: 150px;
+            top: 50%;
-      margin: -75px 0 0 -75px;
+            width: 150px;
-      border-radius: 50%;
+            height: 150px;
-      border: 3px solid transparent;
+            margin: -75px 0 0 -75px;
-      border-top-color: #FFF;
+            border-radius: 50%;
-      -webkit-animation: spin 2s linear infinite;
+            border: 3px solid transparent;
-      -ms-animation: spin 2s linear infinite;
+            border-top-color: #FFF;
-      -moz-animation: spin 2s linear infinite;
+            -webkit-animation: spin 2s linear infinite;
-      -o-animation: spin 2s linear infinite;
+            -ms-animation: spin 2s linear infinite;
-      animation: spin 2s linear infinite;
+            -moz-animation: spin 2s linear infinite;
-      z-index: 1001;
+            -o-animation: spin 2s linear infinite;
-    }
+            animation: spin 2s linear infinite;
+            z-index: 1001;
-    #loader:before {
+        }
-      content: "";
-      position: absolute;
+        #loader:before {
-      top: 5px;
+            content: "";
-      left: 5px;
+            position: absolute;
-      right: 5px;
+            top: 5px;
-      bottom: 5px;
+            left: 5px;
-      border-radius: 50%;
+            right: 5px;
-      border: 3px solid transparent;
+            bottom: 5px;
-      border-top-color: #FFF;
+            border-radius: 50%;
-      -webkit-animation: spin 3s linear infinite;
+            border: 3px solid transparent;
-      -moz-animation: spin 3s linear infinite;
+            border-top-color: #FFF;
-      -o-animation: spin 3s linear infinite;
+            -webkit-animation: spin 3s linear infinite;
-      -ms-animation: spin 3s linear infinite;
+            -moz-animation: spin 3s linear infinite;
-      animation: spin 3s linear infinite;
+            -o-animation: spin 3s linear infinite;
-    }
+            -ms-animation: spin 3s linear infinite;
+            animation: spin 3s linear infinite;
-    #loader:after {
+        }
-      content: "";
-      position: absolute;
+        #loader:after {
-      top: 15px;
+            content: "";
-      left: 15px;
+            position: absolute;
-      right: 15px;
+            top: 15px;
-      bottom: 15px;
+            left: 15px;
-      border-radius: 50%;
+            right: 15px;
-      border: 3px solid transparent;
+            bottom: 15px;
-      border-top-color: #FFF;
+            border-radius: 50%;
-      -moz-animation: spin 1.5s linear infinite;
+            border: 3px solid transparent;
-      -o-animation: spin 1.5s linear infinite;
+            border-top-color: #FFF;
-      -ms-animation: spin 1.5s linear infinite;
+            -moz-animation: spin 1.5s linear infinite;
-      -webkit-animation: spin 1.5s linear infinite;
+            -o-animation: spin 1.5s linear infinite;
-      animation: spin 1.5s linear infinite;
+            -ms-animation: spin 1.5s linear infinite;
-    }
+            -webkit-animation: spin 1.5s linear infinite;
+            animation: spin 1.5s linear infinite;
+        }
-    @-webkit-keyframes spin {
-      0% {
-        -webkit-transform: rotate(0deg);
+        @-webkit-keyframes spin {
-        -ms-transform: rotate(0deg);
+            0% {
-        transform: rotate(0deg);
+                -webkit-transform: rotate(0deg);
-      }
+                -ms-transform: rotate(0deg);
-      100% {
+                transform: rotate(0deg);
-        -webkit-transform: rotate(360deg);
+            }
-        -ms-transform: rotate(360deg);
+            100% {
-        transform: rotate(360deg);
+                -webkit-transform: rotate(360deg);
-      }
+                -ms-transform: rotate(360deg);
-    }
+                transform: rotate(360deg);
+            }
-    @keyframes spin {
+        }
-      0% {
-        -webkit-transform: rotate(0deg);
+        @keyframes spin {
-        -ms-transform: rotate(0deg);
+            0% {
-        transform: rotate(0deg);
+                -webkit-transform: rotate(0deg);
-      }
+                -ms-transform: rotate(0deg);
-      100% {
+                transform: rotate(0deg);
-        -webkit-transform: rotate(360deg);
+            }
-        -ms-transform: rotate(360deg);
+            100% {
-        transform: rotate(360deg);
+                -webkit-transform: rotate(360deg);
-      }
+                -ms-transform: rotate(360deg);
-    }
+                transform: rotate(360deg);
+            }
+        }
-    #loader-wrapper .loader-section {
-      position: fixed;
-      top: 0;
+        #loader-wrapper .loader-section {
-      width: 51%;
+            position: fixed;
-      height: 100%;
+            top: 0;
-      background: #7171C6;
+            width: 51%;
-      z-index: 1000;
+            height: 100%;
-      -webkit-transform: translateX(0);
+            background: #7171C6;
-      -ms-transform: translateX(0);
+            z-index: 1000;
-      transform: translateX(0);
+            -webkit-transform: translateX(0);
-    }
+            -ms-transform: translateX(0);
+            transform: translateX(0);
-    #loader-wrapper .loader-section.section-left {
+        }
-      left: 0;
-    }
+        #loader-wrapper .loader-section.section-left {
+            left: 0;
-    #loader-wrapper .loader-section.section-right {
+        }
-      right: 0;
-    }
+        #loader-wrapper .loader-section.section-right {
+            right: 0;
+        }
-    .loaded #loader-wrapper .loader-section.section-left {
-      -webkit-transform: translateX(-100%);
-      -ms-transform: translateX(-100%);
+        .loaded #loader-wrapper .loader-section.section-left {
-      transform: translateX(-100%);
+            -webkit-transform: translateX(-100%);
-      -webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
+            -ms-transform: translateX(-100%);
-      transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
+            transform: translateX(-100%);
-    }
+            -webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
+            transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
-    .loaded #loader-wrapper .loader-section.section-right {
+        }
-      -webkit-transform: translateX(100%);
-      -ms-transform: translateX(100%);
+        .loaded #loader-wrapper .loader-section.section-right {
-      transform: translateX(100%);
+            -webkit-transform: translateX(100%);
-      -webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
+            -ms-transform: translateX(100%);
-      transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
+            transform: translateX(100%);
-    }
+            -webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
+            transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
-    .loaded #loader {
+        }
-      opacity: 0;
-      -webkit-transition: all 0.3s ease-out;
+        .loaded #loader {
-      transition: all 0.3s ease-out;
+            opacity: 0;
-    }
+            -webkit-transition: all 0.3s ease-out;
+            transition: all 0.3s ease-out;
-    .loaded #loader-wrapper {
+        }
-      visibility: hidden;
-      -webkit-transform: translateY(-100%);
+        .loaded #loader-wrapper {
-      -ms-transform: translateY(-100%);
+            visibility: hidden;
-      transform: translateY(-100%);
+            -webkit-transform: translateY(-100%);
-      -webkit-transition: all 0.3s 1s ease-out;
+            -ms-transform: translateY(-100%);
-      transition: all 0.3s 1s ease-out;
+            transform: translateY(-100%);
-    }
+            -webkit-transition: all 0.3s 1s ease-out;
+            transition: all 0.3s 1s ease-out;
-    .no-js #loader-wrapper {
+        }
-      display: none;
-    }
+        .no-js #loader-wrapper {
+            display: none;
-    .no-js h1 {
+        }
-      color: #222222;
-    }
+        .no-js h1 {
+            color: #222222;
-    #loader-wrapper .load_title {
+        }
-      font-family: Microsoft YaHei;
-      color: #FFF;
+        #loader-wrapper .load_title {
-      font-size: 19px;
+            font-family: Microsoft YaHei;
-      width: 100%;
+            color: #FFF;
-      text-align: center;
+            font-size: 19px;
-      z-index: 9999999999999;
+            width: 100%;
-      position: absolute;
+            text-align: center;
-      top: 60%;
+            z-index: 9999999999999;
-      opacity: 1;
+            position: absolute;
-      line-height: 30px;
+            top: 60%;
-    }
+            opacity: 1;
+            line-height: 30px;
-    #loader-wrapper .load_title span {
+        }
-      font-weight: normal;
-      font-style: italic;
+        #loader-wrapper .load_title span {
-      font-size: 13px;
+            font-weight: normal;
-      color: #FFF;
+            font-style: italic;
-      opacity: 0.5;
+            font-size: 13px;
-    }
+            color: #FFF;
-  </style>
+            opacity: 0.5;
-  </head>
+        }
-  <body>
+    </style>
-    <div id="app">
+</head>
-	    <div id="loader-wrapper">
+<body>
-		    <div id="loader"></div>
+<div id="app">
-		    <div class="loader-section section-left"></div>
+    <div id="loader-wrapper">
-		    <div class="loader-section section-right"></div>
+        <div id="loader"></div>
-		    <div class="load_title">正在加载系统资源，请耐心等待</div>
+        <div class="loader-section section-left"></div>
-        </div>
+        <div class="loader-section section-right"></div>
-	</div>
+        <div class="load_title">正在加载系统资源，请耐心等待</div>
-  </body>
+    </div>
+</div>
+</body>
 </html>
--- a/src/views/informationBase/viewStandard/index.vue
+++ b/src/views/informationBase/viewStandard/index.vue
@@ -16,7 +16,7 @@
      <el-table-column
        label="标准分类"
        sortable
-        min-width="200"
+        width="160"
        prop="standardType"
        align="left"
      >
@@ -34,16 +34,11 @@
      <el-table-column
        prop="standardNo"
        label="标准号"
-        min-width="200"
+        width="160"
        align="left"
      >
      </el-table-column>
-      <el-table-column
+      <el-table-column prop="name" label="标准名称" align="left">
-        prop="name"
-        label="标准名称"
-        min-width="200"
-        align="left"
-      >
        <template slot-scope="scope">
          <div class="font-color" @click="downPdf(scope.row)">
            {{ scope.row.name }}
@@ -53,7 +48,7 @@
      <el-table-column
        prop="standardStatus"
        label="标准状态"
-        min-width="200"
+        width="160"
        align="left"
      >
        <template slot-scope="scope">
@@ -69,25 +64,25 @@
      </el-table-column>
      <el-table-column
        label="发布日期"
-        min-width="200"
+        width="160"
        align="left"
        sortable
        prop="releaseDate"
      >
        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.releaseDate, '{y}-{m}-{d} {h}') }}</span>
+          <span>{{ parseTime(scope.row.releaseDate, '{y}-{m}-{d}') }}</span>
        </template>
      </el-table-column>
      <el-table-column
        label="实施日期"
-        min-width="200"
+        width="160"
        align="left"
        sortable
        prop="implementationDate"
      >
        <template slot-scope="scope">
          <span>{{
-            parseTime(scope.row.implementationDate, '{y}-{m}-{d} {h}')
+            parseTime(scope.row.implementationDate, '{y}-{m}-{d}')
          }}</span>
        </template>
      </el-table-column>

--- a/src/views/informationBase/viewUseCaseLibrary/index.vue
+++ b/src/views/informationBase/viewUseCaseLibrary/index.vue
@@ -89,7 +89,7 @@
        width="180"
      >
        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}') }}</span>
+          <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
        </template>
      </el-table-column>
    </el-table>

--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -9,7 +9,7 @@
      <div class="container">
        <img :src="logoImg" />
      </div>
-      <h3 class="title">中汽研安全检测平台</h3>
+      <h3 class="title">汽车信息安全周期性检测平台</h3>
      <el-form-item prop="username">
        <el-input
          v-model="loginForm.username"
@@ -17,11 +17,7 @@
          auto-complete="off"
          placeholder="账号"
        >
-          <svg-icon
+          <iconpark-icon slot="prefix" name="people" size="20"></iconpark-icon>
-            slot="prefix"
-            icon-class="user"
-            class="el-input__icon input-icon"
-          />
        </el-input>
      </el-form-item>
      <el-form-item prop="password">
@@ -32,11 +28,7 @@
          placeholder="密码"
          @keyup.enter.native="handleLogin"
        >
-          <svg-icon
+          <iconpark-icon slot="prefix" name="lock" size="20"></iconpark-icon>
-            slot="prefix"
-            icon-class="password"
-            class="el-input__icon input-icon"
-          />
        </el-input>
      </el-form-item>
      <el-form-item v-if="captchaEnabled" prop="code">
@@ -215,6 +207,9 @@ export default {
    margin: 10px auto 30px;
    text-align: center;
  }
+  .el-input__prefix {
+    display: flex;
+  }
 }
 //.title {
 //  margin: 0 auto 30px;

--- a/src/views/setting/scene/index.vue
+++ b/src/views/setting/scene/index.vue
@@ -103,7 +103,7 @@
        sortable
      >
        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.storageTime, '{y}-{m}-{d} {h}') }}</span>
+          <span>{{ parseTime(scope.row.storageTime, '{y}-{m}-{d}') }}</span>
        </template>
      </el-table-column>
    </el-table>

--- a/src/views/setting/standard/index.vue
+++ b/src/views/setting/standard/index.vue
@@ -16,7 +16,7 @@
      <el-table-column
        label="标准分类"
        sortable
-        min-width="200"
+        width="160"
        prop="standardType"
        align="left"
      >
@@ -34,16 +34,11 @@
      <el-table-column
        prop="standardNo"
        label="标准号"
-        min-width="200"
+        width="160"
        align="left"
      >
      </el-table-column>
-      <el-table-column
+      <el-table-column prop="name" label="标准名称" align="left">
-        prop="name"
-        label="标准名称"
-        min-width="200"
-        align="left"
-      >
        <template slot-scope="scope">
          <div class="font-color" @click="downPdf(scope.row)">
            {{ scope.row.name }}
@@ -53,7 +48,7 @@
      <el-table-column
        prop="standardStatus"
        label="标准状态"
-        min-width="200"
+        width="160"
        align="left"
      >
        <template slot-scope="scope">
@@ -69,32 +64,32 @@
      </el-table-column>
      <el-table-column
        label="发布日期"
-        min-width="200"
+        width="160"
        align="left"
        sortable
        prop="releaseDate"
      >
        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.releaseDate, '{y}-{m}-{d} {h}') }}</span>
+          <span>{{ parseTime(scope.row.releaseDate, '{y}-{m}-{d}') }}</span>
        </template>
      </el-table-column>
      <el-table-column
        label="实施日期"
-        min-width="200"
+        width="160"
        align="left"
        sortable
        prop="implementationDate"
      >
        <template slot-scope="scope">
          <span>{{
-            parseTime(scope.row.implementationDate, '{y}-{m}-{d} {h}')
+            parseTime(scope.row.implementationDate, '{y}-{m}-{d}')
          }}</span>
        </template>
      </el-table-column>
      <el-table-column
        label="操作"
        align="left"
-        min-width="160"
+        width="240"
        fixed="right"
        class-name="fixed-width"
      >

--- a/src/views/setting/standardTerms/components/documentReviewDialog.vue
+++ b/src/views/setting/standardTerms/components/documentReviewDialog.vue
@@ -6,6 +6,9 @@
    size="40%"
    :before-close="handleClose"
  >
+    <template slot="title">
+      <div class="custom_title">{{ '检验内容' }}</div>
+    </template>
    <el-table
      v-loading="loading"
      class="el-table"
@@ -91,7 +94,12 @@ export default {
 </script>
 <style scoped>
-.el-table {
+.custom_title {
-  width: auto;
+  color: #303133 !important;
+  font-size: 18px;
+  font-weight: 400;
+}
+/deep/ .el-drawer__header {
+  margin-bottom: 0px !important;
 }
 </style>
--- a/src/views/setting/standardTerms/components/vehicleModelDialog.vue
+++ b/src/views/setting/standardTerms/components/vehicleModelDialog.vue
 <template>
  <el-drawer
-    title="检验内容"
    :visible.sync="dialogManger.dialogVisible"
    direction="rtl"
    size="40%"
    :before-close="handleClose"
  >
+    <template slot="title">
+      <div class="custom_title">{{ '检验内容' }}</div>
+    </template>
    <table class="table" style="margin: 20px">
      <thead>
        <tr>
-          <th>标准章节</th>
+          <th>审查要点</th>
-          <th>标准要求</th>
+          <th>审查细则</th>
          <th>关联场景</th>
        </tr>
      </thead>
@@ -98,4 +100,25 @@ export default {
 .table {
  width: auto;
 }
+.table thead {
+  background: none;
+}
+.table th {
+  color: #303133;
+  font-size: 14px;
+  font-weight: 700;
+}
+.table td {
+  color: #606266;
+  font-size: 14px;
+  font-weight: 400;
+}
+.custom_title {
+  color: #303133 !important;
+  font-size: 18px;
+  font-weight: 400;
+}
+/deep/ .el-drawer__header {
+  margin-bottom: 0px !important;
+}
 </style>
--- a/src/views/setting/template/index.vue
+++ b/src/views/setting/template/index.vue
@@ -48,7 +48,7 @@
      <!--      </el-table-column>-->
      <el-table-column label="更新时间" align="left" sortable prop="createTime">
        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}') }}</span>
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
        </template>
      </el-table-column>
      <el-table-column

--- a/src/views/setting/testType/index.vue
+++ b/src/views/setting/testType/index.vue
@@ -104,7 +104,7 @@
        sortable
      >
        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.storageTime, '{y}-{m}-{d} {h}') }}</span>
+          <span>{{ parseTime(scope.row.storageTime, '{y}-{m}-{d}') }}</span>
        </template>
      </el-table-column>
    </el-table>

--- a/src/views/setting/useCaseLibrary/index.vue
+++ b/src/views/setting/useCaseLibrary/index.vue
@@ -94,7 +94,7 @@
        width="180"
      >
        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}') }}</span>
+          <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
        </template>
      </el-table-column>
    </el-table>