From f549372d6796835fcf12391abc8dee8375810d42 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期一, 01 七月 2024 18:13:36 +0800
Subject: [PATCH] ‘’
---
admin/src/views/task/dangetDetail.vue | 14
h5/pages/appointmentDetails/appointmentDetails.vue | 17 +
h5/pages/staff/vehicle/index.vue | 32 ++
h5/static/ic_enter_shinei@2x.png | 0
h5/static/ic_enter_shiwai@2x.png | 0
admin/src/api/business/hiddenDangerParam.js | 6
h5/static/ic_driver@2x.png | 0
admin/src/components/business/OperaHiddenDangerParamWindow.vue | 18
h5/ic_staff@2x.png | 0
h5/pages/applicationRecord/applicationRecord.vue | 2
h5/pages/index/index.vue | 299 +++++++++++-----------
admin/src/api/business/carUseBook.js | 7
h5/ic_driver@2x.png | 0
h5/static/ic_visitor@2x.png | 0
admin/src/views/meeting/bookings.vue | 1
admin/src/components/business/OperaCarUseBookWindow.vue | 49 +-
admin/src/components/operation/HiddenDangerParam.vue | 15
h5/manifest.json | 4
h5/pages/staff/vehicle/apply.vue | 22
h5/pages.json | 7
h5/pages/login/login.vue | 98 +++++++
h5/pages/staff/index.vue | 5
h5/utils/service.js | 2
admin/src/views/operation/serviceCar/apprConfig.vue | 4
h5/login_bg@2x.png | 0
h5/static/ic_staff@2x.png | 0
h5/ic_visitor@2x.png | 0
h5/App.vue | 14
admin/src/views/operation/serviceCar/apprRecord.vue | 22 +
admin/src/views/operation/danger/record.vue | 7
h5/pages/answer/answer.vue | 77 +++--
31 files changed, 465 insertions(+), 257 deletions(-)
diff --git a/admin/src/api/business/carUseBook.js b/admin/src/api/business/carUseBook.js
index 5fea156..4d9caf0 100644
--- a/admin/src/api/business/carUseBook.js
+++ b/admin/src/api/business/carUseBook.js
@@ -6,6 +6,13 @@
trim: true
})
}
+// 瀵煎嚭
+export function carUseBookRecordEx (data) {
+ return request.post('/visitsAdmin/cloudService/business/carUseBook/exportExcel', data, {
+ trim: true,
+ download: true
+ })
+}
// 鏌ヨ
export function findLogList (data) {
return request.post('/visitsAdmin/cloudService/business/carUseBookLog/findList', data, {
diff --git a/admin/src/api/business/hiddenDangerParam.js b/admin/src/api/business/hiddenDangerParam.js
index 89d4128..9373c06 100644
--- a/admin/src/api/business/hiddenDangerParam.js
+++ b/admin/src/api/business/hiddenDangerParam.js
@@ -11,6 +11,12 @@
trim: true
})
}
+export function exportExcel (data) {
+ return request.post('/visitsAdmin/cloudService/business/hiddenDanger/exportExcel', data, {
+ trim: true,
+ download: true
+ })
+}
export function memberList (data) {
return request.post('/visitsAdmin/cloudService/business/hiddenDangerParam/findHiddenAreaMemberList', data, {
trim: true
diff --git a/admin/src/components/business/OperaCarUseBookWindow.vue b/admin/src/components/business/OperaCarUseBookWindow.vue
index b92af71..6da76fc 100644
--- a/admin/src/components/business/OperaCarUseBookWindow.vue
+++ b/admin/src/components/business/OperaCarUseBookWindow.vue
@@ -110,7 +110,7 @@
</div>
<!-- -->
<template v-slot:footer>
- <el-button @click="isShowProblem = true" type="primary" v-if="model.approveDateVO!=null&& model.approveDateVO.canBeApproved!=null &&model.approveDateVO.canBeApproved ==1 " class="status-red">鍚屾剰</el-button>
+ <el-button @click="agreeOpen" type="primary" v-if="model.approveDateVO!=null&& model.approveDateVO.canBeApproved!=null &&model.approveDateVO.canBeApproved ==1 " class="status-red">鍚屾剰</el-button>
<el-button @click="isBackProblem=true" type="danger" v-if="model.approveDateVO!=null&& model.approveDateVO.canBeApproved!=null &&model.approveDateVO.canBeApproved ==1 " >鎷掔粷</el-button>
<el-button @click="visible=false">杩斿洖</el-button>
</template>
@@ -123,8 +123,9 @@
width="480px"
>
<el-form :model="dealForm" ref="dealForm" >
- <el-form-item label="娲捐溅鍙告満" prop="driverId" required v-if="model.approveDateVO!=null && model.approveDateVO.drvierParam ===1">
- <el-select v-model="transForm.driverId" style="width: 300px" filterable clearable placeholder="璇烽�夋嫨娲鹃仯鍙告満">
+ <!-- <el-form-item label="娲捐溅鍙告満" prop="driverId" required v-if="model.approveDateVO!=null && model.approveDateVO.driverParam === 1"> -->
+ <el-form-item label="娲捐溅鍙告満" prop="driverId" required v-if="model.approveDateVO!=null && model.approveDateVO.driverParam == 0">
+ <el-select v-model="dealForm.driverId" style="width: 300px" filterable clearable placeholder="璇烽�夋嫨娲鹃仯鍙告満">
<el-option
v-for="item in memberList"
:key="item.id"
@@ -138,7 +139,7 @@
type="textarea"
placeholder="璇峰～鍐欒鏄�"
:rows="4"
- v-model="backForm.checkInfo"
+ v-model="dealForm.checkInfo"
/>
</el-form-item>
</el-form>
@@ -222,9 +223,9 @@
this.dealing = true
approveDo({
objId: this.dataId,
- objType: this.model.type == 1?4:3,
+ objType: this.model.type == 1 ? 4 : 3,
status: 2,
- driverId: this.dealForm.driveId,
+ driverId: this.dealForm.driverId,
checkInfo: this.dealForm.checkInfo
})
.then(res => {
@@ -238,27 +239,31 @@
})
})
},
+ agreeOpen () {
+ this.isShowProblem = true
+ this.loadMemberList()
+ },
backDo () {
this.$refs.backForm.validate((valid) => {
if (!valid) {
return
}
approveDo({
- objId: this.dataId,
- objType: this.model.type == 1?4:3,
- status: 3,
- checkInfo: this.dealForm.checkInfo
- }).then(res => {
- this.$tip.apiSuccess('閫�鍥炴垚鍔�')
- this.getDetail()
- this.isBackProblem = false
- })
- .catch(e => {
- })
- .finally(() => {
- this.dealing = false
- })
+ objId: this.dataId,
+ objType: this.model.type == 1 ? 4 : 3,
+ status: 3,
+ checkInfo: this.dealForm.checkInfo
+ }).then(res => {
+ this.$tip.apiSuccess('閫�鍥炴垚鍔�')
+ this.getDetail()
+ this.isBackProblem = false
+ })
+ .catch(e => {
})
+ .finally(() => {
+ this.dealing = false
+ })
+ })
},
open (title, target) {
this.title = title
@@ -283,10 +288,6 @@
this.model = res
this.dealForm.driveId = res.driveId
})
- },
- handleTransfer () {
- this.isShowTransfer = true
- this.loadMemberList()
},
loadMemberList () {
driveList({}).then(res => {
diff --git a/admin/src/components/business/OperaHiddenDangerParamWindow.vue b/admin/src/components/business/OperaHiddenDangerParamWindow.vue
index 1f2e576..78ca1dd 100644
--- a/admin/src/components/business/OperaHiddenDangerParamWindow.vue
+++ b/admin/src/components/business/OperaHiddenDangerParamWindow.vue
@@ -61,17 +61,17 @@
})
},
methods: {
- open (title, target,type) {
+ open (title, target, type) {
this.title = title
this.visible = true
- this.form.type=type
+ this.form.type = type
this.loadMember()
// 鏂板缓缁勭粐
if (target == null) {
this.$nextTick(() => {
this.$refs.form.resetFields()
this.form[this.configData['field.id']] = null
- this.form.type=type
+ this.form.type = type
})
return
}
@@ -79,13 +79,13 @@
this.$nextTick(() => {
for (const key in this.form) {
this.form[key] = target[key]
- this.form.type=type
- if (this.type ==0 && target.memberIds != null && target.memberIds != '') {
- let t = target.memberIds.split(',')
- this.form.memberIdList =[]
- t.forEach(item =>{
+ this.form.type = type
+ if (this.form.type == 0 && target.memberIds != null && target.memberIds != '') {
+ const t = target.memberIds.split(',')
+ this.form.memberIdList = []
+ t.forEach(item => {
this.form.memberIdList.push(parseInt(item))
- });
+ })
}
}
})
diff --git a/admin/src/components/operation/HiddenDangerParam.vue b/admin/src/components/operation/HiddenDangerParam.vue
index f96d588..947776d 100644
--- a/admin/src/components/operation/HiddenDangerParam.vue
+++ b/admin/src/components/operation/HiddenDangerParam.vue
@@ -158,6 +158,8 @@
const memberNames = item.memberNames.split(',')
if (memberIds && memberIds.length === 1) {
this.$set(this.param, 'checkUserId', memberIds[0])
+ } else {
+ this.$set(this.param, 'checkUserId', '')
}
memberIds.forEach((mem, i) => {
arr.push({
@@ -255,10 +257,15 @@
display: flex;
flex-wrap: wrap;
.item {
- width: 140px;
- max-height: 140px;
+ width: 92px;
+ max-height: 92px;
margin-left: 10px;
position: relative;
+ border: 1px dashed #d9d9d9;
+ border-radius: 4px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
.close{
font-size: 20px;
position: absolute;
@@ -269,8 +276,8 @@
cursor: pointer;
}
.img {
- width: 140px;
- max-height: 90px;
+ width: 92px;
+ max-height: 92px;
}
}
}
diff --git a/admin/src/views/meeting/bookings.vue b/admin/src/views/meeting/bookings.vue
index 706d8fc..6830547 100644
--- a/admin/src/views/meeting/bookings.vue
+++ b/admin/src/views/meeting/bookings.vue
@@ -52,6 +52,7 @@
type="datetimerange"
range-separator="鑷�"
value-format="yyyy-MM-dd HH:mm:ss"
+ :default-time="['00:00:00', '23:59:59']"
start-placeholder="寮�濮嬫椂闂�"
end-placeholder="缁撴潫鏃堕棿"
@change="selectDate"
diff --git a/admin/src/views/operation/danger/record.vue b/admin/src/views/operation/danger/record.vue
index da410d6..d59d296 100644
--- a/admin/src/views/operation/danger/record.vue
+++ b/admin/src/views/operation/danger/record.vue
@@ -3,7 +3,7 @@
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
<el-form-item label="鎻愭姤浜�" prop="memberName">
- <el-input v-model="searchForm.memberName" placeholder="璇疯緭鍏ュ鍚�/鎵嬫満鍙�" @keypress.enter.native="search"></el-input>
+ <el-input v-model="searchForm.memberName" placeholder="璇疯緭鍏ュ鍚�" @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="鎻愭姤浜虹粍缁�" prop="companyName">
<el-input v-model="searchForm.companyName" placeholder="璇疯緭鍏�" clearable @keypress.enter.native="search"></el-input>
@@ -43,6 +43,7 @@
type="datetimerange"
format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss"
+ :default-time="['00:00:00', '23:59:59']"
range-separator="鑷�"
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡">
@@ -155,9 +156,7 @@
.then(() => {
this.exLoading = true
exportExcel({
- page: this.pagination.page,
- capacity: 1000000,
- model: this.filters
+ model: this.searchForm
})
.then(response => {
this.download(response)
diff --git a/admin/src/views/operation/serviceCar/apprConfig.vue b/admin/src/views/operation/serviceCar/apprConfig.vue
index e977f26..9f397cf 100644
--- a/admin/src/views/operation/serviceCar/apprConfig.vue
+++ b/admin/src/views/operation/serviceCar/apprConfig.vue
@@ -2,8 +2,8 @@
<TableLayout>
<template v-slot:table-wrap>
<el-tabs v-model="activeType" @tab-click="handleClick">
- <el-tab-pane label="瀹ゅ唴鐢ㄨ溅" name="3"></el-tab-pane>
- <el-tab-pane label="瀹ゅ鐢ㄨ溅" name="4"></el-tab-pane>
+ <el-tab-pane label="甯傚唴鐢ㄨ溅" name="3"></el-tab-pane>
+ <el-tab-pane label="甯傚鐢ㄨ溅" name="4"></el-tab-pane>
</el-tabs>
<div class="config">
<div class="config_list">
diff --git a/admin/src/views/operation/serviceCar/apprRecord.vue b/admin/src/views/operation/serviceCar/apprRecord.vue
index c204187..6c8f7d5 100644
--- a/admin/src/views/operation/serviceCar/apprRecord.vue
+++ b/admin/src/views/operation/serviceCar/apprRecord.vue
@@ -34,6 +34,7 @@
type="datetimerange"
format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss"
+ :default-time="['00:00:00', '23:59:59']"
range-separator="鑷�"
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡">
@@ -53,7 +54,7 @@
<template v-slot:table-wrap>
<ul class="toolbar" v-permissions="['business:carusebook:create','business:carusebook:exportExcel']">
<li><el-button type="primary" @click="handleEdit" icon="el-icon-plus" v-permissions="['business:carusebook:create']">鏂板缓</el-button></li>
- <li><el-button type="danger" @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:carusebook:exportExcel']">瀵煎嚭</el-button></li>
+ <li><el-button type="primary" @click="handleEx" v-permissions="['business:carusebook:exportExcel']">瀵煎嚭</el-button></li>
</ul>
<el-table
v-loading="isWorking.search"
@@ -122,6 +123,7 @@
import OperaCarUseBookParamWindow from '@/components/operation/OperCarUseBookParamWindow.vue'
import { timeForMat } from '@/utils/util'
import { allList } from '@/api/business/hiddenDangerParam'
+import { carUseBookRecordEx } from '@/api/business/carUseBook'
export default {
name: 'Empower',
extends: BaseTable,
@@ -155,6 +157,24 @@
this.loadParams()
},
methods: {
+ handleEx () {
+ this.$dialog.exportConfirm('纭瀵煎嚭鍚楋紵')
+ .then(() => {
+ this.exLoading = true
+ carUseBookRecordEx({
+ model: this.searchForm
+ })
+ .then(response => {
+ this.download(response)
+ })
+ .catch(e => {
+ this.$tip.apiFailed(e)
+ })
+ .finally(() => {
+ this.exLoading = false
+ })
+ })
+ },
changeRadio (e) {
this.searchForm.radio = e
if (e === '0') {
diff --git a/admin/src/views/task/dangetDetail.vue b/admin/src/views/task/dangetDetail.vue
index 76d3a71..7a7012b 100644
--- a/admin/src/views/task/dangetDetail.vue
+++ b/admin/src/views/task/dangetDetail.vue
@@ -34,7 +34,7 @@
<div class="label">鐜板満鎯呭喌</div>
<div class="value">
<div class="file_list">
- <template v-for="item in info.submitFileList">
+ <div class="file" v-for="item in info.submitFileList">
<img
v-if="item.type == 0"
:key="item.id"
@@ -49,7 +49,7 @@
class="img"
controls
/>
- </template>
+ </div>
</div>
</div>
</div>
@@ -458,7 +458,7 @@
}
}
},
- created() {
+ created () {
this.getMemberList()
},
methods: {
@@ -666,10 +666,14 @@
}
.file_list {
display: flex;
- .img {
- width: 200px;
+ .file {
+ width: 92px;
margin-right: 12px;
margin-bottom: 12px;
+ .img{
+ max-height: 92px;
+ max-width: 92px;
+ }
}
}
.value {
diff --git a/h5/App.vue b/h5/App.vue
index 6026277..622fd7a 100644
--- a/h5/App.vue
+++ b/h5/App.vue
@@ -35,13 +35,13 @@
}
// 鍒锋柊token
const token = uni.getStorageSync('token')
- if (token) {
- // refreshToken().then(res => {
- // if(res.code && res.code === 200){
- // this.$store.commit('setToken', res.data)
- // }
- // })
- }
+ // if (token) {
+ // refreshToken().then(res => {
+ // if(res.code && res.code === 200){
+ // this.$store.commit('setToken', res.data)
+ // }
+ // })
+ // }
},
onShow: function () {
console.log('App Show')
diff --git a/h5/ic_driver@2x.png b/h5/ic_driver@2x.png
new file mode 100644
index 0000000..0997cdf
--- /dev/null
+++ b/h5/ic_driver@2x.png
Binary files differ
diff --git a/h5/ic_staff@2x.png b/h5/ic_staff@2x.png
new file mode 100644
index 0000000..8006cfd
--- /dev/null
+++ b/h5/ic_staff@2x.png
Binary files differ
diff --git a/h5/ic_visitor@2x.png b/h5/ic_visitor@2x.png
new file mode 100644
index 0000000..fe007c8
--- /dev/null
+++ b/h5/ic_visitor@2x.png
Binary files differ
diff --git a/h5/login_bg@2x.png b/h5/login_bg@2x.png
new file mode 100644
index 0000000..1a40354
--- /dev/null
+++ b/h5/login_bg@2x.png
Binary files differ
diff --git a/h5/manifest.json b/h5/manifest.json
index 6e448ff..22a90b7 100644
--- a/h5/manifest.json
+++ b/h5/manifest.json
@@ -91,8 +91,8 @@
"proxy" : {
"/admin_interface" : {
// 杩欎釜瀛楁鍚嶉渶涓庝綘閰嶇疆鐨刡asePrefixUrl涓�鑷达紝绯荤粺璇嗗埆鍒板甫鏈�/dev-api璇锋眰鐨勫湴鍧�鏃讹紝浼氬湪鍓嶉潰鎷兼帴涓婁唬鐞嗘湇鍔″櫒鍦板潃
- "target" : "http://192.168.0.173/admin_interface", // 浠ｇ悊鏈嶅姟鍣ㄥ煙鍚嶆垨IP鍦板潃
- // "target" : "http://192.168.0.135:10010", // 浠ｇ悊鏈嶅姟鍣ㄥ煙鍚嶆垨IP鍦板潃
+ // "target" : "http://192.168.0.173/admin_interface", // 浠ｇ悊鏈嶅姟鍣ㄥ煙鍚嶆垨IP鍦板潃
+ "target" : "http://192.168.0.135:10010", // 浠ｇ悊鏈嶅姟鍣ㄥ煙鍚嶆垨IP鍦板潃
"changeOrigin" : true, // 鍏佽璺ㄥ煙
"pathRewrite" : {
"^/admin_interface" : "" // 閲嶅啓鍦板潃锛屽鏋滃疄闄呮帴鍙ｄ腑鏄笉甯�/dev-api锛岄渶瑕佸皢杩欎釜鍓嶇紑缃┖锛屽洜涓鸿繖涓墠缂�鍙槸涓轰簡璇嗗埆鐢紝璇嗗埆瀹屼箣鍚庡氨娌＄敤浜�
diff --git a/h5/pages.json b/h5/pages.json
index 8fc4ef3..3384649 100644
--- a/h5/pages.json
+++ b/h5/pages.json
@@ -4,6 +4,13 @@
},
"pages": [
{
+ "path": "pages/login/login",
+ "style": {
+ "navigationBarTitleText": "閫夋嫨韬唤",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
"path": "pages/index/index",
"style": {
"navigationBarTitleText": "璁垮涓績",
diff --git a/h5/pages/answer/answer.vue b/h5/pages/answer/answer.vue
index e1cc20a..0129113 100644
--- a/h5/pages/answer/answer.vue
+++ b/h5/pages/answer/answer.vue
@@ -8,12 +8,12 @@
<view class="box_list_answer" v-if="list && list.length > 0">
<view v-if="status == 1 || status == 2" class="score_static">
<text class="name">鏈寰楀垎锛�</text>
- <text class="num" :class="{warry: status == 2}">{{ score }}鍒�</text>
+ <text class="num" :class="{ warry: status == 2 }">{{ score }}鍒�</text>
</view>
<!-- 鍗曢��/鍒ゆ柇 -->
<view v-for="(item, index) in list" :key="index" class="list_item">
<view class="box_list_answer_name">
- <text>{{ index + 1 }}銆亄{ item.title}}</text>
+ <text>{{ index + 1 }}銆亄{ item.title }}</text>
<text v-if="item.score"> ({{ item.score }}鍒�)</text>
<text style="color: #ed4545">*</text>
</view>
@@ -83,14 +83,18 @@
</view>
<view
class="box_list_answer_tips"
+ style="margin-bottom: 0rpx"
v-if="
item.selAnswer &&
item.answer !== item.selAnswer &&
status != '0'
"
>
- <image src="@/static/ic_wrong@2x.png" />
- <text>鍥炵瓟閿欒</text>
+ <view class="line">
+ <image src="@/static/ic_wrong@2x.png" />
+ <text>鍥炵瓟閿欒</text>
+ </view>
+ <view class="line">姝ｇ‘绛旀锛歿{ item.answer }}</view>
</view>
<view
class="box_list_answer_tips"
@@ -100,8 +104,10 @@
status != '0'
"
>
- <image src="@/static/ic_success@2.png" />
- <text class="success">鍥炵瓟姝ｇ‘</text>
+ <view class="line">
+ <image src="@/static/ic_success@2.png" />
+ <text class="success">鍥炵瓟姝ｇ‘</text>
+ </view>
</view>
</template>
<template v-if="item.type == 2">
@@ -116,8 +122,7 @@
src="@/static/checkbo1x_sel@2x.png"
v-if="
(line.checked && status != '2') ||
- (item.selAnswer === item.answer &&
- line.checked)
+ (item.selAnswer === item.answer && line.checked)
"
/>
<image
@@ -135,8 +140,7 @@
<text
v-if="
(line.checked && status != '2') ||
- (item.selAnswer === item.answer &&
- line.checked)
+ (item.selAnswer === item.answer && line.checked)
"
style="color: rgba(77, 153, 168, 1)"
><text class="mr24" style="color: rgba(77, 153, 168, 1)">{{
@@ -165,8 +169,11 @@
status != '0'
"
>
- <image src="@/static/ic_wrong@2x.png" />
- <text>鍥炵瓟閿欒</text>
+ <view class="line">
+ <image src="@/static/ic_wrong@2x.png" />
+ <text>鍥炵瓟閿欒</text>
+ </view>
+ <view class="line">姝ｇ‘绛旀锛歿{ item.answer }}</view>
</view>
<view
class="box_list_answer_tips"
@@ -176,8 +183,10 @@
status != '0'
"
>
- <image src="@/static/ic_success@2.png" />
- <text class="success">鍥炵瓟姝ｇ‘</text>
+ <view class="line">
+ <image src="@/static/ic_success@2.png" />
+ <text class="success">鍥炵瓟姝ｇ‘</text>
+ </view>
</view>
</template>
</view>
@@ -237,12 +246,12 @@
score: 0
}
},
- computed:{
- answerIng(){
+ computed: {
+ answerIng() {
let count = 0
this.list.forEach(item => {
- if(item.selAnswer || item.selAnswer == 0){
- count ++
+ if (item.selAnswer || item.selAnswer == 0) {
+ count++
}
})
return count === this.list.length
@@ -307,7 +316,7 @@
},
// 鍗曢�夐�夋嫨涓鐩�
select(line, i) {
- if(this.status === '2') return
+ if (this.status === '2') return
this.list.forEach((item, index) => {
if (index === i) {
item.selAnswer = line.code
@@ -316,7 +325,7 @@
// this.problemIndex = index
},
changeBox(index, jeck) {
- if(this.status === '2') return
+ if (this.status === '2') return
this.list.forEach((item, i) => {
if (index === i) {
item.options.forEach((item2, j) => {
@@ -356,7 +365,7 @@
},
// 涓嬩竴棰�
onSubmit() {
- if(!this.answerIng) return
+ if (!this.answerIng) return
const { list } = this
// 楠岃瘉鎵�鏈夐鐩兘鏈夐�夐」
let count = 0
@@ -376,7 +385,7 @@
list.forEach(item => {
if (item.selAnswer !== item.answer) {
flag++
- }else{
+ } else {
this.score += item.score
}
})
@@ -468,9 +477,17 @@
box-sizing: border-box;
background: #f7f7f7;
border-radius: 8rpx;
- display: flex;
- align-items: center;
margin-bottom: 24rpx;
+ .line {
+ display: flex;
+ align-items: center;
+ font-size: 28rpx;
+ color: #333333;
+ margin-bottom: 20rpx;
+ &:nth-last-child(1){
+ margin-bottom: 0;
+ }
+ }
image {
width: 28rpx;
height: 28rpx;
@@ -486,18 +503,18 @@
}
}
}
- .score_static{
+ .score_static {
display: flex;
font-size: 32rpx;
margin-bottom: 40rpx;
- .name{
+ .name {
font-weight: 600;
}
- .num{
+ .num {
color: $uni-color-primary;
}
- .warry{
- color: #ED4545;
+ .warry {
+ color: #ed4545;
}
}
.list_item {
@@ -541,7 +558,7 @@
font-size: 30rpx;
color: #ffffff;
}
- .disable{
+ .disable {
background-color: #cccccc;
}
}
diff --git a/h5/pages/applicationRecord/applicationRecord.vue b/h5/pages/applicationRecord/applicationRecord.vue
index a390d45..b9d0641 100644
--- a/h5/pages/applicationRecord/applicationRecord.vue
+++ b/h5/pages/applicationRecord/applicationRecord.vue
@@ -111,7 +111,7 @@
methods: {
handleDetail(id) {
uni.navigateTo({
- url: "/pages/appointmentDetails/appointmentDetails?id=" + id
+ url: "/pages/appointmentDetails/appointmentDetails?detail=1&id=" + id
})
},
tabsClick(val) {
diff --git a/h5/pages/appointmentDetails/appointmentDetails.vue b/h5/pages/appointmentDetails/appointmentDetails.vue
index ce81109..e9a26ee 100644
--- a/h5/pages/appointmentDetails/appointmentDetails.vue
+++ b/h5/pages/appointmentDetails/appointmentDetails.vue
@@ -77,10 +77,25 @@
data() {
return {
info: {},
- show: false
+ show: false,
+ detail: ''
}
},
+ onBackPress(options) {
+ if (this.detail == 1) {
+ uni.redirectTo({
+ url: '/pages/applicationRecord/applicationRecord'
+ })
+ } else {
+ uni.redirectTo({
+ url: '/pages/index/index'
+ })
+ }
+
+ return true
+ },
onLoad(option) {
+ this.detail = option.detail || ''
this.getDetail(option.id)
// visitorSubDetail({ id: option.id })
// .then(res => {
diff --git a/h5/pages/index/index.vue b/h5/pages/index/index.vue
index cc4c1c6..f477b93 100644
--- a/h5/pages/index/index.vue
+++ b/h5/pages/index/index.vue
@@ -1,162 +1,167 @@
<template>
- <view class="box">
- <view class="box_head">
- <text>瀹夋嘲鐗╂祦鏅烘収鍥尯</text>
- <text class="h2">璁垮涓撳尯</text>
- <image mode="widthFix" class="banner_bg" src="@/static/banner.jpg" />
- </view>
- <view class="main_title">涓氬姟鍔炵悊</view>
- <view class="box_list">
- <view class="box_list_item" @click="jump(1)">
- <image src="@/static/ic_laifangdengji.png" mode="widthFix" />
- </view>
- <view class="box_list_item" @click="jump(2)">
- <image src="@/static/ic_yuyuejilu.png" mode="widthFix" />
- </view>
- <view class="box_list_item" @click="jump(3)">
- <image src="@/static/ic_yuanqudaolan.png" mode="widthFix" />
- </view>
- <view class="box_list_item" @click="jump(4)">
- <image src="@/static/ic_yuyuezhinan.png" mode="widthFix" />
- </view>
- </view>
- <!-- <view class="box_btn">閫�鍑虹櫥褰�</view> -->
- <view class="copyright">
- <image src="@/static/logo_s@2x.png" mode="widthFix" />
- <text>瀹夊窘瀹夋嘲鐗╂祦鏈夐檺璐ｄ换鍏徃鐗堟潈鎵�鏈�</text>
- </view>
- </view>
+ <view class="box">
+ <view class="box_head">
+ <text>瀹夋嘲鐗╂祦鏅烘収鍥尯</text>
+ <text class="h2">璁垮涓撳尯</text>
+ <image mode="widthFix" class="banner_bg" src="@/static/banner.jpg" />
+ </view>
+ <view class="main_title">涓氬姟鍔炵悊</view>
+ <view class="box_list">
+ <view class="box_list_item" @click="jump(1)">
+ <image src="@/static/ic_laifangdengji.png" mode="widthFix" />
+ </view>
+ <view class="box_list_item" @click="jump(2)">
+ <image src="@/static/ic_yuyuejilu.png" mode="widthFix" />
+ </view>
+ <view class="box_list_item" @click="jump(3)">
+ <image src="@/static/ic_yuanqudaolan.png" mode="widthFix" />
+ </view>
+ <view class="box_list_item" @click="jump(4)">
+ <image src="@/static/ic_yuyuezhinan.png" mode="widthFix" />
+ </view>
+ </view>
+ <!-- <view class="box_btn">閫�鍑虹櫥褰�</view> -->
+ <view class="copyright">
+ <image src="@/static/logo_s@2x.png" mode="widthFix" />
+ <text>瀹夊窘瀹夋嘲鐗╂祦鏈夐檺璐ｄ换鍏徃鐗堟潈鎵�鏈�</text>
+ </view>
+ </view>
</template>
<script>
import image from 'uview-ui/libs/config/props/image'
- export default {
+export default {
- data() {
- return {
+ data() {
+ return {
- }
- },
-
- methods: {
- jump(type) {
- switch (type) {
- case 1:
- uni.navigateTo({
- url: '/pages/notice/notice'
- })
- break
- case 2:
- uni.navigateTo({
- url: '/pages/applicationRecord/applicationRecord'
- })
- break
- case 3:
- uni.navigateTo({
- url: '/pages/guidemap/guidemap'
- })
- break
- case 4:
- uni.navigateTo({
- url: '/pages/visitorSubGuide/index'
- })
- break
- }
- }
- }
- }
+ }
+ },
+ onBackPress(options) {
+ uni.redirectTo({
+ url: '/pages/login/login'
+ })
+ return true
+ },
+ methods: {
+ jump(type) {
+ switch (type) {
+ case 1:
+ uni.navigateTo({
+ url: '/pages/notice/notice'
+ })
+ break
+ case 2:
+ uni.navigateTo({
+ url: '/pages/applicationRecord/applicationRecord'
+ })
+ break
+ case 3:
+ uni.navigateTo({
+ url: '/pages/guidemap/guidemap'
+ })
+ break
+ case 4:
+ uni.navigateTo({
+ url: '/pages/visitorSubGuide/index'
+ })
+ break
+ }
+ }
+ }
+}
</script>
<style lang="scss" scoped>
- .box {
- width: 100%;
- height: auto;
- padding: 30rpx;
- box-sizing: border-box;
+.box {
+ width: 100%;
+ height: auto;
+ padding: 30rpx;
+ box-sizing: border-box;
- .box_btn {
- position: fixed;
- bottom: 70rpx;
- left: 50%;
- transform: translate(-50%, 0);
- width: 208rpx;
- height: 72rpx;
- line-height: 72rpx;
- text-align: center;
- border-radius: 36rpx;
- border: 1rpx solid #999999;
- font-size: 28rpx;
- font-weight: 400;
- color: #333333;
- }
+ .box_btn {
+ position: fixed;
+ bottom: 70rpx;
+ left: 50%;
+ transform: translate(-50%, 0);
+ width: 208rpx;
+ height: 72rpx;
+ line-height: 72rpx;
+ text-align: center;
+ border-radius: 36rpx;
+ border: 1rpx solid #999999;
+ font-size: 28rpx;
+ font-weight: 400;
+ color: #333333;
+ }
- .box_head {
- width: 100%;
- height: 270rpx;
- padding: 0 44rpx;
- box-sizing: border-box;
- border-radius: 8rpx;
- display: flex;
- flex-direction: column;
- position: relative;
- .banner_bg{
- position: absolute;
- top: 0;
- left: 0;
- width: 100%;
- z-index: -1;
- }
- .h2 {
- font-size: 28rpx;
- font-family: SourceHanSansSC, SourceHanSansSC;
- font-weight: 400;
- color: #FFFFFF;
- margin-top: 14rpx;
- }
- text {
- &:first-child {
- font-size: 44rpx;
- font-family: SourceHanSansSC, SourceHanSansSC;
- font-weight: bold;
- color: #FFFFFF;
- margin-top: 54rpx;
- }
- }
- }
- .main_title{
- font-weight: 600;
- font-size: 32rpx;
- color: #222222;
- margin: 40rpx 0 32rpx;
- }
- .box_list {
- width: 100%;
- display: flex;
- align-items: center;
- flex-wrap: wrap;
- justify-content: space-between;
- margin-top: 40rpx;
+ .box_head {
+ width: 100%;
+ height: 270rpx;
+ padding: 0 44rpx;
+ box-sizing: border-box;
+ border-radius: 8rpx;
+ display: flex;
+ flex-direction: column;
+ position: relative;
+ .banner_bg {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ z-index: -1;
+ }
+ .h2 {
+ font-size: 28rpx;
+ font-family: SourceHanSansSC, SourceHanSansSC;
+ font-weight: 400;
+ color: #ffffff;
+ margin-top: 14rpx;
+ }
+ text {
+ &:first-child {
+ font-size: 44rpx;
+ font-family: SourceHanSansSC, SourceHanSansSC;
+ font-weight: bold;
+ color: #ffffff;
+ margin-top: 54rpx;
+ }
+ }
+ }
+ .main_title {
+ font-weight: 600;
+ font-size: 32rpx;
+ color: #222222;
+ margin: 40rpx 0 32rpx;
+ }
+ .box_list {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ flex-wrap: wrap;
+ justify-content: space-between;
+ margin-top: 40rpx;
- .box_list_item {
- width: 100%;
- margin-bottom: 20rpx;
- image {
- width: 100%;
- }
- }
- }
- .copyright{
- display: flex;
- align-items: center;
- justify-content: center;
- margin-top: 84rpx;
- font-size: 24rpx;
- color: #666666;
- image{
- width: 40rpx;
- height: 40rpx;
- }
- }
- }
+ .box_list_item {
+ width: 100%;
+ margin-bottom: 20rpx;
+ image {
+ width: 100%;
+ }
+ }
+ }
+ .copyright {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ margin-top: 84rpx;
+ font-size: 24rpx;
+ color: #666666;
+ image {
+ width: 40rpx;
+ height: 40rpx;
+ }
+ }
+}
</style>
\ No newline at end of file
diff --git a/h5/pages/login/login.vue b/h5/pages/login/login.vue
new file mode 100644
index 0000000..94f9275
--- /dev/null
+++ b/h5/pages/login/login.vue
@@ -0,0 +1,98 @@
+<template>
+ <view class="main_app">
+ <image class="login_bg" src="@/static/login_bg@2x.png" />
+ <view class="h1">瀹夋嘲鐗╂祦鏅烘収鍥尯</view>
+ <view class="placeholder6 place">璇烽�夋嫨鎮ㄧ殑韬唤</view>
+ <view class="item" @click="jump('/pages/index/index')">
+ <image class="avatar" src="@/static/ic_visitor@2x.png" />
+ <view class="content">
+ <view class="name">鎴戞槸璁垮</view>
+ <view class="placeholder6">VISITOR</view>
+ </view>
+ <u-icon name="arrow-right" size="24" color="#979797" />
+ </view>
+ <view class="item" @click="jump('/pages/staffLogin/login')">
+ <image class="avatar" src="@/static/ic_staff@2x.png" />
+ <view class="content">
+ <view class="name">鎴戞槸鍛樺伐</view>
+ <view class="placeholder6">STAFF</view>
+ </view>
+ <u-icon name="arrow-right" size="24" color="#979797" />
+ </view>
+ <view class="item">
+ <image class="avatar" src="@/static/ic_driver@2x.png" />
+ <view class="content">
+ <view class="name">鎴戞槸鐗╂祦杞﹀徃鏈�</view>
+ <view class="placeholder6">DRIVER</view>
+ </view>
+ <u-icon name="arrow-right" size="24" color="#979797" />
+ </view>
+ </view>
+</template>
+
+<script>
+export default {
+ methods: {
+ jump(url) {
+ console.log(url);
+ uni.navigateTo({
+ url
+ })
+ }
+ }
+}
+</script>
+
+<style lang="scss" >
+.main_app {
+ width: 100%;
+ height: 100vh;
+ padding-top: 80rpx;
+ background: linear-gradient(
+ 180deg,
+ rgba(39, 155, 170, 0.2) 0%,
+ rgba(39, 155, 170, 0) 100%
+ );
+ .login_bg {
+ position: absolute;
+ top: 0;
+ width: 750rpx;
+ z-index: -1;
+ }
+ .h1 {
+ font-weight: 600;
+ font-size: 48rpx;
+ color: #222222;
+ line-height: 66rpx;
+ margin-bottom: 16rpx;
+ }
+ .place{
+ margin-bottom: 98rpx;
+ }
+ .item {
+ width: 690rpx;
+ height: 200rpx;
+ background: #ffffff;
+ border-radius: 8rpx;
+ display: flex;
+ align-items: center;
+ padding: 40rpx;
+ font-size: 26rpx;
+ margin-bottom: 40rpx;
+ .avatar {
+ width: 120rpx;
+ height: 120rpx;
+ margin-right: 30rpx;
+ }
+ .content {
+ flex: 1;
+ .name {
+ font-weight: 600;
+ font-size: 38rpx;
+ color: #222222;
+ margin-bottom: 20rpx;
+ }
+ }
+ }
+}
+</style>
\ No newline at end of file
diff --git a/h5/pages/staff/index.vue b/h5/pages/staff/index.vue
index 341f9b3..054cca9 100644
--- a/h5/pages/staff/index.vue
+++ b/h5/pages/staff/index.vue
@@ -99,12 +99,11 @@
},
onLoad() {
console.log('userInfo', this.userInfo)
-
},
onShow() {
- // if (this.userInfo && this.userInfo.name) {
+ if (this.userInfo && this.userInfo.memberId) {
this.getTaskInfo()
- // }
+ }
},
methods: {
jump(path) {
diff --git a/h5/pages/staff/vehicle/apply.vue b/h5/pages/staff/vehicle/apply.vue
index c2e224f..159180f 100644
--- a/h5/pages/staff/vehicle/apply.vue
+++ b/h5/pages/staff/vehicle/apply.vue
@@ -91,13 +91,15 @@
}"
>
<text v-if="param.memberNames">
- <text v-for="mem,i in param.memberList" :key="mem.id">
- <template v-if="i < 2">
- <text>{{ mem.name }}</text>
- <text v-if="i < 1 && param.memberList.length > 1">,</text>
- </template>
- </text>
- <text v-if="param.memberList.length > 2">绛墈{ param.memberList.length }}浜�</text>
+ <text v-for="(mem, i) in param.memberList" :key="mem.id">
+ <template v-if="i < 2">
+ <text>{{ mem.name }}</text>
+ <text v-if="i < 1 && param.memberList.length > 1">,</text>
+ </template>
+ </text>
+ <text v-if="param.memberList.length > 2"
+ >绛墈{ param.memberList.length }}浜�</text
+ >
</text>
<text v-else>璇烽�夋嫨</text>
</text>
@@ -135,10 +137,10 @@
</view>
<view class="sub_btn" @click="handleSub">鎻愪氦</view>
<!-- -->
+ <!-- :minDate="new Date(param.startTime).getTime()"
+ :maxDate="new Date(param.endTime).getTime()" -->
<u-datetime-picker
:show="isShowDatetime"
- :minDate="new Date(param.startTime).getTime()"
- :maxDate="new Date(param.endTime).getTime()"
@confirm="confirmDate"
@cancel="isShowDatetime = false"
mode="datetime"
@@ -207,7 +209,7 @@
})
},
selPeople() {
- if(this.param.memberList && this.param.memberList.length > 0){
+ if (this.param.memberList && this.param.memberList.length > 0) {
setTimeout(() => {
this.$eventBus.$emit('applePeoDetail', this.param.memberList || [])
}, 500)
diff --git a/h5/pages/staff/vehicle/index.vue b/h5/pages/staff/vehicle/index.vue
index f38ca36..60124ef 100644
--- a/h5/pages/staff/vehicle/index.vue
+++ b/h5/pages/staff/vehicle/index.vue
@@ -1,7 +1,7 @@
<template>
<view class="main_app">
<image
- src="../../../static/staff/yongche_bg.png"
+ src="@/static/staff/yongche_bg.png"
class="banner"
mode="widthFix"
></image>
@@ -10,20 +10,34 @@
<view class="title">閫夋嫨鐩殑鍦扮被鍒�</view>
<view class="item" @click="$jump('/pages/staff/vehicle/shinei')">
<image
- src="../../../static/bg_shineiyongche@2x.png"
+ src="@/static/bg_shineiyongche@2x.png"
class="img"
mode="widthFix"
></image>
- <view class="h1">甯傚唴鐢ㄨ溅</view>
+ <view class="h1">
+ <text>甯傚唴鐢ㄨ溅</text>
+ <image
+ src="@/static/ic_enter_shinei@2x.png"
+ class="icon"
+ mode="widthFix"
+ ></image>
+ </view>
<view class="h2">URBAN AREA</view>
</view>
<view class="item" @click="$jump('/pages/staff/vehicle/shiwai')">
<image
- src="../../../static/bg_shiwaiyongche@2x.png"
+ src="@/static/bg_shiwaiyongche@2x.png"
class="img"
mode="widthFix"
></image>
- <view class="h1">甯傚鐢ㄨ溅</view>
+ <view class="h1">
+ <text>甯傚鐢ㄨ溅</text>
+ <image
+ src="@/static/ic_enter_shiwai@2x.png"
+ class="icon"
+ mode="widthFix"
+ ></image>
+ </view>
<view class="h2">SUBURB AREA</view>
</view>
</view>
@@ -70,6 +84,12 @@
color: #222222;
line-height: 48rpx;
margin-bottom: 10rpx;
+ display: flex;
+ align-items: center;
+ .icon{
+ width: 32rpx;
+ margin-left: 10rpx;
+ }
}
.h2 {
font-size: 22rpx;
@@ -91,7 +111,7 @@
font-size: 34rpx;
color: #222222;
line-height: 48rpx;
- text-align: center;
+ text-align: center;
}
}
.banner {
diff --git a/h5/static/ic_driver@2x.png b/h5/static/ic_driver@2x.png
new file mode 100644
index 0000000..0997cdf
--- /dev/null
+++ b/h5/static/ic_driver@2x.png
Binary files differ
diff --git a/h5/static/ic_enter_shinei@2x.png b/h5/static/ic_enter_shinei@2x.png
new file mode 100644
index 0000000..9fec9a7
--- /dev/null
+++ b/h5/static/ic_enter_shinei@2x.png
Binary files differ
diff --git a/h5/static/ic_enter_shiwai@2x.png b/h5/static/ic_enter_shiwai@2x.png
new file mode 100644
index 0000000..9683583
--- /dev/null
+++ b/h5/static/ic_enter_shiwai@2x.png
Binary files differ
diff --git a/h5/static/ic_staff@2x.png b/h5/static/ic_staff@2x.png
new file mode 100644
index 0000000..8006cfd
--- /dev/null
+++ b/h5/static/ic_staff@2x.png
Binary files differ
diff --git a/h5/static/ic_visitor@2x.png b/h5/static/ic_visitor@2x.png
new file mode 100644
index 0000000..fe007c8
--- /dev/null
+++ b/h5/static/ic_visitor@2x.png
Binary files differ
diff --git a/h5/utils/service.js b/h5/utils/service.js
index 4131187..41d0bdf 100644
--- a/h5/utils/service.js
+++ b/h5/utils/service.js
@@ -37,7 +37,7 @@
}
if (data.code === 5112) {
uni.navigateTo({
- url: '/pages/staffLogin/login'
+ url: '/pages/login/login'
})
}
resolve(data)
--
Gitblit v1.9.3