guzijian / bsth-alcohol-sign-web · Commits

Commit 9aeb947a37413519a7b89173498588cd92e0d669

Authored by guzijian
1 parent 31a096ad

feat: 主页放行

Inline Side-by-side
Showing 3 changed files with 25 additions and 37 deletions
src/permission.js
  View file @9aeb947
@@ -11,7 +11,7 @@ import router from './router' @@ -11,7 +11,7 @@ import router from './router'
11 11
12 NProgress.configure({ showSpinner: false }); 12 NProgress.configure({ showSpinner: false });
13 13
14 -const whiteList = ['/login', '/register','/in']; 14 +const whiteList = ['/login', '/register','/in','/home/index'];
15 15
16 router.beforeEach((to, from, next) => { 16 router.beforeEach((to, from, next) => {
17 NProgress.start() 17 NProgress.start()
src/router/index.js
  View file @9aeb947
@@ -47,6 +47,12 @@ export const constantRoutes = [ @@ -47,6 +47,12 @@ export const constantRoutes = [
47 component: () => import('@/views/in/in'), 47 component: () => import('@/views/in/in'),
48 hidden: true 48 hidden: true
49 }, 49 },
  50 +
  51 + {
  52 + path: '/home/index',
  53 + component: () => import('@/views/home/index'),
  54 + hidden: true
  55 + },
50 { 56 {
51 path: '/register', 57 path: '/register',
52 component: () => import('@/views/register'), 58 component: () => import('@/views/register'),
src/views/config/config/index.vue
  View file @9aeb947
@@ -7,29 +7,7 @@ @@ -7,29 +7,7 @@
7 <el-form-item label="路牌" prop="lpName"> 7 <el-form-item label="路牌" prop="lpName">
8 <el-input v-model="queryParams.lpName" placeholder="请输入路牌" clearable @keyup.enter="handleQuery" /> 8 <el-input v-model="queryParams.lpName" placeholder="请输入路牌" clearable @keyup.enter="handleQuery" />
9 </el-form-item> 9 </el-form-item>
10 - <el-form-item label="第一次签到时间" prop="firstSignInTime">  
11 - <el-input v-model="queryParams.firstSignInTime" placeholder="请输入第一次签到时间" clearable @keyup.enter="handleQuery" />  
12 - </el-form-item>  
13 - <el-form-item label="第一次签退时间" prop="firstSignOutTime">  
14 - <el-input v-model="queryParams.firstSignOutTime" placeholder="请输入第一次签退时间" clearable @keyup.enter="handleQuery" />  
15 - </el-form-item>  
16 - <el-form-item label="今天还是隔天" prop="firstSignTodayTomorrow">  
17 - <el-input v-model="queryParams.firstSignTodayTomorrow" placeholder="请输入今天还是隔天" clearable  
18 - @keyup.enter="handleQuery" />  
19 - </el-form-item>  
20 - <el-form-item label="分班标识" prop="secondFlag">  
21 - <el-input v-model="queryParams.secondFlag" placeholder="请输入分班标识" clearable @keyup.enter="handleQuery" />  
22 - </el-form-item>  
23 - <el-form-item label="分班签到时间" prop="secondSignInTime">  
24 - <el-input v-model="queryParams.secondSignInTime" placeholder="请输入分班签到时间" clearable @keyup.enter="handleQuery" />  
25 - </el-form-item>  
26 - <el-form-item label="分班签退时间" prop="secondSignOutTime">  
27 - <el-input v-model="queryParams.secondSignOutTime" placeholder="请输入分班签退时间" clearable @keyup.enter="handleQuery" />  
28 - </el-form-item>  
29 - <el-form-item label="今天还是隔天" prop="secondSignTodayTomorrow">  
30 - <el-input v-model="queryParams.secondSignTodayTomorrow" placeholder="请输入今天还是隔天" clearable  
31 - @keyup.enter="handleQuery" />  
32 - </el-form-item> 10 +
33 <el-form-item> 11 <el-form-item>
34 <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button> 12 <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
35 <el-button icon="Refresh" @click="resetQuery">重置</el-button> 13 <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -59,23 +37,27 @@ @@ -59,23 +37,27 @@
59 <el-table-column type="selection" width="55" align="center" /> 37 <el-table-column type="selection" width="55" align="center" />
60 <el-table-column label="线路名" align="center" prop="lineName" /> 38 <el-table-column label="线路名" align="center" prop="lineName" />
61 <el-table-column label="路牌" align="center" prop="lpName" /> 39 <el-table-column label="路牌" align="center" prop="lpName" />
62 - <el-table-column label="签到时间" align="center" prop="firstSignInTime" />  
63 - <el-table-column label="签退时间" align="center" prop="firstSignOutTime" />  
64 - <el-table-column label="今天还是隔天" align="center" prop="firstSignTodayTomorrow">  
65 - <template #default="scope">  
66 - <dict-tag :options="today_or_tomorrow" :value="scope.row.firstSignTodayTomorrow" />  
67 - </template>  
68 - </el-table-column>  
69 - <el-table-column label="分班标识" align="center" prop="secondFlag"> 40 + <el-table-column label="第一段打卡" align="center" prop="firstSignOutTime" width="200">
70 <template #default="scope"> 41 <template #default="scope">
71 - <dict-tag :options="sublevel" :value="scope.row.secondFlag" /> 42 + <!-- 如果时隔天就显示 +1 红色 -->
  43 + <div style="height: 20px;">{{ scope.row.firstSignInTime }} -
  44 + {{ scope.row.firstSignOutTime }}
  45 + <span v-if="scope.row.firstSignTodayTomorrow == 2" style="color:red;font-size: x-small ;position: absolute;
  46 + right: 0px;
  47 + top: 0px;
  48 + display: inline;">+1天</span>
  49 + </div>
72 </template> 50 </template>
73 </el-table-column> 51 </el-table-column>
74 - <el-table-column label="分班签到时间" align="center" prop="secondSignInTime" />  
75 - <el-table-column label="分班签退时间" align="center" prop="secondSignOutTime" />  
76 - <el-table-column label="今天还是隔天" align="center" prop="secondSignTodayTomorrow"> 52 + <el-table-column label="第二段打卡" align="center" prop="secondSignInTime">
77 <template #default="scope"> 53 <template #default="scope">
78 - <dict-tag :options="today_or_tomorrow" :value="scope.row.secondSignTodayTomorrow" /> 54 + <!-- 如果时隔天就显示 +1 红色 -->
  55 + <span style="height: 20px;">{{ scope.row.secondSignInTime }} -
  56 + {{ scope.row.secondSignOutTime }}
  57 + <span v-if="scope.row.secondSignTodayTomorrow == 2" style="color:red;font-size: 12px; position: absolute;
  58 + top: 0px;
  59 + display: inline;">+1天</span>
  60 + </span>
79 </template> 61 </template>
80 </el-table-column> 62 </el-table-column>
81 <el-table-column label="备注" align="center" prop="remark" /> 63 <el-table-column label="备注" align="center" prop="remark" />