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

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
-        prop="name"
-        label="标准名称"
-        min-width="200"
-        align="left"
-      >
+      <el-table-column prop="name" label="标准名称" 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>

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>

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
-            slot="prefix"
-            icon-class="user"
-            class="el-input__icon input-icon"
-          />
+          <iconpark-icon slot="prefix" name="people" size="20"></iconpark-icon>
         </el-input>
       </el-form-item>
       <el-form-item prop="password">
@@ -32,11 +28,7 @@
           placeholder="密码"
           @keyup.enter.native="handleLogin"
         >
-          <svg-icon
-            slot="prefix"
-            icon-class="password"
-            class="el-input__icon input-icon"
-          />
+          <iconpark-icon slot="prefix" name="lock" size="20"></iconpark-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;

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>

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
-        prop="name"
-        label="标准名称"
-        min-width="200"
-        align="left"
-      >
+      <el-table-column prop="name" label="标准名称" 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"
       >

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 {
-  width: auto;
+.custom_title {
+  color: #303133 !important;
+  font-size: 18px;
+  font-weight: 400;
+}
+/deep/ .el-drawer__header {
+  margin-bottom: 0px !important;
 }
 </style>

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>

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

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>

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>