修改bug

public/staticConfig.js

@@ -51,6 +51,14 @@ switch (baseNewUrl) {
       hasStaticRoutes: true,
     }
     break
+  case '120.26.64.82':
+    PLATFROM_CONFIG = {
+      ...PLATFROM_CONFIG,
+      baseNewUrl: 'http://120.26.64.82:8765',
+      baseURLCA: 'http://120.26.64.82:8765',
+      hasStaticRoutes: true,
+    }
+    break
   case 'localhost':
     PLATFROM_CONFIG = {
       ...PLATFROM_CONFIG,

src/layout/components/Navbar.vue

@@ -112,7 +112,7 @@ export default {
     },
     async logout () {
       await this.$store.dispatch('user/logout')
-      this.$router.push(`/login?redirect=${this.$route.fullPath}`)
+      this.$router.push(`/login`)
     },
     getBreadcrumb () {
       return this.$route.matched.filter(item => item.name && item.meta.title)

src/layout/index.vue

@@ -220,7 +220,7 @@ export default {
             this.outQd()
           }, 2000)
         } else {
-          this.$message.error(res.message ?? '旧密码输入错误')
+          this.$message.error(res.message ?? '密码修改失败')
         }
       } catch (error) {
         this.$message.error('失败')

src/router/index.js

@@ -69,9 +69,21 @@ export const constantRoutes = [
   //     },
   //   ],
   // },
+  // {
+  //   path: '/',
+  //   redirect: '/newDeparture',
+  // },
   {
     path: '/',
-    redirect: '/newDeparture',
+    component: Layout,
+    hidden: true,
+    children: [
+      {
+        path: '',
+        name: 'HomePage',
+        component: () => import('@/views/HomePage/index.vue'),
+      },
+    ],
   },
   // { path: '/', redirect: '/nopower', component: () => import('@/views/noPower'), hidden: true }
   // 404 page must be placed at the end !!!
@@ -132,7 +144,7 @@ router.beforeEach((to, from, next) => {
 })
 
 // Detail see: https://github.com/vuejs/vue-router/issues/1234#issuecomment-357941465
-export function resetRouter() {
+export function resetRouter () {
   const newRouter = createRouter()
   router.matcher = newRouter.matcher // reset router
 }

src/utils/request.js

@@ -71,7 +71,14 @@ service.interceptors.response.use(
             location.reload();
           },
         });
-      } else {
+      } else if (res.message && res.message.includes('Duplicate entry')) {
+        Message({
+          message: '数据重复,执行失败',
+          type: "error",
+          duration: 3 * 1000
+        });
+      }
+      else {
         Message({
           message: res.message || "网络错误",
           type: "error",

src/views/HomePage/index.vue

@@ -0,0 +1,34 @@
+<template>
+  <div class="home-wrapper">
+    <div class="home-title">
+      <h1 class="home-title-main">欢迎使用</h1>
+      <h2 class="home-title-sub">行李全流程跟踪数据系统</h2>
+    </div>
+  </div>
+</template>
+
+<style scoped lang="scss">
+.home-wrapper {
+  margin: calc(var(--app-main-padding) * -1);
+  width: calc(100% + var(--app-main-padding) * 2);
+  height: calc(100vh - 80px);
+  background: url("../../assets/home/BG_.jpg") no-repeat center center;
+  background-size: cover;
+  display: flex;
+  align-items: center;
+  .home-title {
+    width: 100%;
+    text-align: center;
+    font-family: Microsoft YaHei;
+    font-weight: bold;
+    color: #ffffff;
+    &-main {
+      font-size: 40px;
+      margin-bottom: 16px;
+    }
+    &-sub {
+      font-size: 24px;
+    }
+  }
+}
+</style>

src/views/statisticsCharts/views/workloadStatisticsCharts.vue

@@ -1,10 +1,5 @@
 <template>
-  <CommonBarStatisticsCharts
-    charts-title="工作量"
-    :query-settings="querySettings"
-    :form-data="formData"
-    :form-items="formItems"
-  />
+  <CommonBarStatisticsCharts charts-title="工作量" :query-settings="querySettings" :form-data="formData" :form-items="formItems" />
 </template>
 
 <script>
@@ -15,7 +10,7 @@ import { parseTime } from '@/utils'
 export default {
   name: 'WorkloadStatisticsCharts',
   components: { CommonBarStatisticsCharts },
-  data() {
+  data () {
     const that = this
     return {
       querySettings: {
@@ -49,7 +44,7 @@ export default {
               label: '按年统计',
             },
           ],
-          changeHandler(value, oldValue) {
+          changeHandler (value, oldValue) {
             const typeMap = {
               日: 'datePicker',
               月: 'monthPicker',
@@ -69,12 +64,10 @@ export default {
                 }
                 if (value === '月') {
                   if (oldValue === '年') {
-                    this.formData.dateTime[0] = `${
-                      dateTime[0].split('-')[0]
-                    }-01`
-                    this.formData.dateTime[1] = `${
-                      dateTime[1].split('-')[0]
-                    }-12`
+                    this.formData.dateTime[0] = `${dateTime[0].split('-')[0]
+                      }-01`
+                    this.formData.dateTime[1] = `${dateTime[1].split('-')[0]
+                      }-12`
                   }
                   if (oldValue === '日') {
                     this.formData.dateTime[0] = dateTime[0]
@@ -89,12 +82,10 @@ export default {
                 }
                 if (value === '日') {
                   if (oldValue === '年') {
-                    this.formData.dateTime[0] = `${
-                      dateTime[0].split('-')[0]
-                    }-01-01`
-                    this.formData.dateTime[1] = `${
-                      dateTime[1].split('-')[0]
-                    }-12-31`
+                    this.formData.dateTime[0] = `${dateTime[0].split('-')[0]
+                      }-01-01`
+                    this.formData.dateTime[1] = `${dateTime[1].split('-')[0]
+                      }-12-31`
                   }
                   if (oldValue === '月') {
                     this.formData.dateTime[0] = `${dateTime[0]
@@ -128,7 +119,7 @@ export default {
           setKey: 'code3',
           requiredWarning: '请先选择航站',
           options: [],
-          changeHandler(value) {
+          changeHandler (value) {
             that.agent_number = ''
             that.getAgentOptions(value)
           },
@@ -138,6 +129,7 @@ export default {
           inputType: 'select',
           placeholder: '操作人',
           requiredWarning: '请先选择操作人',
+          filterable: true,
           options: [],
         },
         {
@@ -150,7 +142,7 @@ export default {
     }
   },
   methods: {
-    async getAgentOptions(airport) {
+    async getAgentOptions (airport) {
       try {
         const { code, returnData, message } = await Query({
           serviceId: SERVICE_ID.agentCode,

src/views/table/index.vue

@@ -61,7 +61,7 @@
                       </el-select>
                     </template>
                     <template v-else-if="fromDataType(item.dataType) == 'text'">
-                      <el-input size="small" :rows="1" type="textarea" @change="inputChangeHandler(item.columnName)" v-model="tableForm[item.columnName]"></el-input>
+                      <el-input size="small" :placeholder="item.columnDescribe" :rows="1" type="textarea" @change="inputChangeHandler(item.columnName)" v-model="tableForm[item.columnName]"></el-input>
                     </template>
                     <template v-else-if="fromDataType(item.dataType) == 'date'">
                       <el-date-picker class="datetimes" value-format="yyyy-MM-dd" v-model="tableForm[item.columnName]" type="date" placeholder="选择日期" @change="inputChangeHandler(item.columnName)">
@@ -75,7 +75,7 @@
                       <el-input size="small" v-model.number="tableForm[item.columnName]" onkeyup="value=value.replace(/[^1-9]/g,'')" @change="inputChangeHandler(item.columnName)"></el-input>
                     </template>
                     <template v-else>
-                      <el-input size="small" v-model="tableForm[item.columnName]" @change="inputChangeHandler(item.columnName)"></el-input>
+                      <el-input size="small" :placeholder="item.columnDescribe" v-model="tableForm[item.columnName]" @change="inputChangeHandler(item.columnName)"></el-input>
                     </template>
                   </el-form-item>
                 </el-col>