优化logo

src/option/storagecost/Traincostbreakdown.js

@@ -89,6 +89,17 @@ export const columnList = [
     sortable: true,
     head: false,
   },
+  {
+    prop: 'trainCompletionTime',
+    label: '复核完成时',
+    type: 1,
+    values: '',
+    width: '200',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
   {
     prop: 'destinationWarehouse',
     label: '目的仓',

src/page/login/index.vue

@@ -14,8 +14,10 @@
       <div class="login-border">
         <div class="login-main">
           <h4 class="login-title">
+            <img src="../../../public/img/logo-login.png" />
             <!-- {{ $t('login.title') }} -->
-            {{ website.title }}
+            <!-- {{ website.title }} -->
+            <span>物流信息平台</span>
             <!-- <top-lang></top-lang> -->
             <!-- 语言转换 -->
           </h4>
@@ -76,7 +78,7 @@ export default {
     this.handleLogin();
     this.getTime();
   },
-  mounted() {},
+  mounted() { },
   computed: {
     ...mapGetters(['tagWel']),
   },
@@ -148,13 +150,29 @@ export default {
 
 <style lang="scss">
 @import '@/styles/login.scss';
+
 .index_footer {
   position: fixed;
   bottom: 0;
   width: 100%;
+
   p {
     text-align: center;
     color: #999;
   }
 }
+
+.login-title {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+
+  img {
+    width: 130px;
+    height: 60px;
+  }
+span{
+  margin-left: 10px;
+}
+}
 </style>

src/page/login/userlogin.vue

@@ -1,7 +1,5 @@
 <template>
-  <div class="login-logo">
-    <img src="../../../public/img/p-logo.png" />
-  </div>
+
   <el-form
     class="login-form"
     status-icon
@@ -361,10 +359,10 @@ export default {
 }
 .login-logo {
   position: absolute;
-  right: 60px;
+  // right: 60px;
   top: 66px;
   img {
-    width: 60px;
+    width:130px;
     height: 60px;
   }
 }

src/views/cost/Deliverycostmanagement/Traincostbreakdown.vue

@@ -38,7 +38,19 @@
                 :value-format="'YYYY-MM-DD HH:mm:ss'"
               />
             </el-form-item>
-
+            <el-form-item label="复核完成时间">
+              <el-date-picker
+                v-model="TopQuery.traintime"
+                type="datetimerange"
+                unlink-panels
+                range-separator="至"
+                start-placeholder="开始时间"
+                end-placeholder="结束时间"
+                :shortcuts="shortcuts"
+                :default-time="defaultTime2"
+                :value-format="'YYYY-MM-DD HH:mm:ss'"
+              />
+            </el-form-item>
             <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
             <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
           </el-form-item>
@@ -433,6 +445,14 @@ const TopSearch = () => {
     delete details.query.deliveryDateStart;
     delete details.query.deliveryDateEnd;
   }
+  if (TopQuery.value.traintime?.length) {
+    details.query.trainCompletionTimeStart = TopQuery.value.traintime[0]; //开始日期
+    details.query.trainCompletionTimeEnd = TopQuery.value.traintime[1]; //结束日期
+  } else {
+    delete details.query.trainCompletionTimeStart;
+    delete details.query.trainCompletionTimeEnd;
+  }
+  
 
   if (TopQuery.value.destinationWarehouse?.length) {
     details.query.destinationWarehouse = TopQuery.value.destinationWarehouse.join(',');