结构调整

src/projects/business/apis/Master/person.js → src/projects/business/apis/Master/company.js

@@ -18,3 +18,12 @@ export function addPerson(params) {
 		method: 'post',
 	})
 }
+
+//单位列表
+export function queryCompanyList(params) {
+	return request({
+		url: '/mobile/personDeviceLogApi/queryCompanyList',
+		data: Qs.stringify(params),
+		method: 'post',
+	})
+}

src/projects/business/router/common.js

@@ -104,7 +104,7 @@ const routesCommon = [
 					//手机开门
 					{
 						path: 'openDoor',
-						name: 'CommonOpenDoor',
+						name: 'CommonDeviceOpenDoor',
 						component: () => import('../views/Common/Device/OpenDoor.vue'),
 						meta: {
 							requireAuth: false,

src/projects/business/router/master.js

@@ -117,7 +117,7 @@ const routesMaster = [
 				path: 'guest',
 				component: () => import('../views/Layout.vue'),
 				children: [
-					//访客列表
+					//访客记录
 					{
 						path: 'list',
 						name: 'MasterGuestList',
@@ -128,29 +128,7 @@ const routesMaster = [
 							title: '访客列表',
 						}
 					},
-					//邀请访客
-					{
-						path: 'invitation',
-						name: 'MasterGuestInvitation',
-						component: () => import('../views/Master/Guest/Invitation.vue'),
-						meta: {
-							requireAuth: false,
-							role: [],
-							title: '访客列表',
-						}
-					},
-					//邀请访客码
-					{
-						path: 'code',
-						name: 'MasterGuestCode',
-						component: () => import('../views/Master/Guest/Code.vue'),
-						meta: {
-							requireAuth: false,
-							role: [],
-							title: '邀请访客码',
-						}
-					},
-					//申请详情
+					//访客详情
 					{
 						path: 'info',
 						name: 'MasterGuestInfo',
@@ -161,17 +139,6 @@ const routesMaster = [
 							title: '申请详情',
 						}
 					},
-					//同行人员详情
-					{
-						path: 'partner',
-						name: 'MasterGuestPartner',
-						component: () => import('../views/Master/Guest/Partner.vue'),
-						meta: {
-							requireAuth: false,
-							role: [],
-							title: '同行人员详情',
-						}
-					},
 				]
 			},
 
@@ -658,16 +625,27 @@ const routesMaster = [
 				],
 			},
 
-			//人员
+			//公司及人员
 			{
-				path: 'person',
+				path: 'company',
 				component: () => import('../views/Layout.vue'),
 				children: [
+					//公司列表
+					{
+						path: 'list',
+						name: 'MasterCompanyList',
+						component: () => import('../views/Master/Company/List.vue'),
+						meta: {
+							requireAuth: false,
+							role: [],
+							title: '公司列表',
+						}
+					},
 					//添加人员
 					{
 						path: 'add',
-						name: 'MasterPersonAdd',
-						component: () => import('../views/Master/Person/Add.vue'),
+						name: 'MasterCompanyAddPerson',
+						component: () => import('../views/Master/Company/AddPerson.vue'),
 						meta: {
 							requireAuth: false,
 							role: [],
@@ -677,8 +655,8 @@ const routesMaster = [
 					//添加人员选择设备
 					{
 						path: 'device',
-						name: 'MasterPersonSelectDevice',
-						component: () => import('../views/Master/Person/SelectDevice.vue'),
+						name: 'MasterCompanySelectDevice',
+						component: () => import('../views/Master/Company/SelectDevice.vue'),
 						meta: {
 							requireAuth: false,
 							role: [],

src/projects/business/views/Master/Person/Add.vue → src/projects/business/views/Master/Company/AddPerson.vue

@@ -56,7 +56,7 @@
 	import * as types from '$project/store/mutation-types'
 	import Cropper from '$project/components/Cropper.vue'
 	export default {
-		name: 'MasterPersonAdd',
+		name: 'MasterCompanyAddPerson',
 		components: {
 			Common,
 			Loading,

src/projects/business/views/Master/Company/List.vue

@@ -0,0 +1,103 @@
+<template>
+	<div>
+		<common @asynCallBack="asynCallBack"></common>
+		<top-header :pageTitle="pageTitle"></top-header>
+
+		<div class="mui-content vongi-dwlist">
+			<ul class="mui-table-view openfyy-list">
+
+				<li class="mui-table-view-cell mui-media" v-for="(item,index) in companyList" :key="index">
+					<a @click="goto(item.id,item.name)" class="mui-navigate-right">
+						<div class="mui-media-body">
+							{{item.name}}
+							<h4 class='mui-pull-right'><span class="color4fc5f7">{{item.detectedNum}}</span>/<span class="color4fc5f7">{{item.personNum}}</span></h4>
+						</div>
+					</a>
+				</li>
+
+			</ul>
+			<h6>已测：<span class="color4fc5f7">{{sumDetectedNum}}</span> / 应测：<span class="color4fc5f7">{{sumPersonNum}}</span></h6>
+		</div>
+		<loading :visible="isLoading"></loading>
+
+	</div>
+</template>
+
+
+<script>
+	import * as API_Company from '@/apis/Master/company'
+
+	import Common from '$project/components/Common.vue'
+	import Loading from '$project/components/Loading.vue'
+	import TopHeader from '$project/components/TopHeader.vue'
+
+	import {
+		mapGetters,
+		mapMutations
+	} from 'vuex'
+	export default {
+		name: 'MasterCompanyList',
+		components: {
+			Common,
+			Loading,
+			TopHeader
+		},
+		data() {
+			return {
+				pageTitle: '单位列表',
+
+				isLoading: false,
+
+				companyList: [],
+				sumDetectedNum: 0,
+				sumPersonNum: 0,
+			}
+		},
+		created() {
+
+		},
+		methods: {
+			goto(id, name) {
+
+				this.$router.push({
+					name: 'MasterHealthWorkerTemperature',
+					query: {
+						companyId: id,
+						companyName: escape(name)
+					}
+				})
+			},
+			//提交
+			getCompanyList() {
+				this.isLoading = true;
+				API_Company.queryCompanyList().then(response => {
+					this.isLoading = false;
+
+					this.companyList = response.list;
+					this.sumDetectedNum = response.sumDetectedNum;
+					this.sumPersonNum = response.sumPersonNum;
+
+				}).catch(error => {
+					this.isLoading = false;
+					mui.toast(error);
+				})
+			},
+			asynCallBack() {
+
+			},
+		},
+		mounted() {
+			//获取公司列表
+			this.getCompanyList();
+		},
+		destroyed() {},
+		computed: {
+
+		}
+	}
+</script>
+
+<style scoped src="$project/assets/css/xpwyfyy.css"></style>
+<style src="$project/assets/css/iconfont.css"></style>
+<style>
+</style>

src/projects/business/views/Master/Person/SelectDevice.vue → src/projects/business/views/Master/Company/SelectDevice.vue

@@ -27,7 +27,7 @@
 </template>
 
 <script>
-	import * as API_Person from '@/apis/Master/person'
+	import * as API_Company from '@/apis/Master/company'
 	import Common from '$project/components/Common.vue'
 	import Loading from '$project/components/Loading.vue'
 	import TopHeader from '$project/components/TopHeader.vue'
@@ -36,7 +36,7 @@
 		mapMutations
 	} from 'vuex'
 	export default {
-		name: 'MasterPersonSelectDevice',
+		name: 'MasterCompanySelectDevice',
 		components: {
 			Common,
 			Loading,
@@ -75,7 +75,7 @@
 			//获取设备列表
 			getList() {
 				this.isLoading = true;
-				API_Person.getDeviceList().then(response => {
+				API_Company.getDeviceList().then(response => {
 					this.isLoading = false;
 					this.recordList = response;
 				}).catch(error => {
@@ -98,7 +98,7 @@
 
 				if (this.checkForm()) {
 					this.isLoading = true;
-					API_Person.addPerson(this.subForm).then(response => {
+					API_Company.addPerson(this.subForm).then(response => {
 						this.isLoading = false;
 						this.successVisible = true;
 					}).catch(error => {

src/projects/business/views/Master/Guest/Code.vue

@@ -1,8 +0,0 @@
-<template>
-</template>
-
-<script>
-</script>
-
-<style>
-</style>

src/projects/business/views/Master/Guest/Info.vue

@@ -1,8 +1,146 @@
 <template>
+	<div>
+		<header class="mui-bar mui-bar-nav">
+			<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
+			<h1 class="mui-title">详情</h1>
+		</header>
+		<div class="mui-content vongi-qingjiadt">
+			<div id="slider" class="mui-slider mui-fullscreen">
+				<div id="sliderSegmentedControl" class="mui-scroll-wrapper mui-slider-indicator mui-segmented-control mui-segmented-control-inverted">
+					<div class="mui-scroll">
+						<a class="mui-control-item mui-active" href="#item1mobile">
+							访客信息
+						</a>
+						<a class="mui-control-item" href="#item2mobile">
+							核验信息
+						</a>
+					</div>
+				</div>
+				<div class="mui-slider-group vongi-fkdat">
+					<div id="item1mobile" class="mui-slider-item mui-control-content mui-active">
+						<div id="scroll1" class="mui-scroll-wrapper">
+							<div class="mui-scroll">
+								<form class="mui-input-group mui-content-padded">
+									<div class="mui-input-row">
+										<label>拜访人</label>
+										<span>王后雄</span>
+									</div>
+									<div class="mui-input-row">
+										<label>预约时间</label>
+										<span>2020-9-18 15:00:00</span>
+									</div>
+									<div class="mui-input-row">
+										<label>来访单位</label>
+										<span>湖北荆盛商贸有限公司</span>
+									</div>
+									<div class="mui-input-row">
+										<label>同行人员</label>
+										<span class="vongi-fkdat-name">
+											<div class="flew">
+												<h5>冯</h5>
+												<h5>冯</h5>
+												<h5>冯</h5>
+											</div>
+										</span>
+									</div>
+									<div class="mui-input-row">
+										<label>来访事由</label>
+										<span>业务洽谈</span>
+									</div>
+									<div class="mui-input-row">
+										<label>车牌号</label>
+										<span>鄂D9999V</span>
+									</div>
+								</form>
+								<form class="mui-input-group mui-content-padded">
+									<div class="mui-input-row">
+										<label>受访人员</label>
+										<span>其他</span>
+									</div>
+									<div class="mui-input-row">
+										<label>审核状态</label>
+										<span class="color55f868">已通过</span>
+									</div>
+									<div class="mui-input-row">
+										<label>审核时间</label>
+										<span>2020-09-17 11:00:00</span>
+									</div>
+									<div class="mui-input-row">
+										<label>访问时间</label>
+										<span>15:00:00-17:30:00</span>
+									</div>
+									<div class="mui-input-row">
+										<label>总耗时</label>
+										<span>2小时30分0秒</span>
+									</div>
+
+								</form>
+							</div>
+						</div>
+					</div>
+					<div id="item2mobile" class="mui-slider-item mui-control-content">
+						<div class="mui-scroll-wrapper">
+							<div class="mui-scroll">
+								<form class="mui-input-group mui-content-padded">
+									<div class="mui-input-row">
+										<label>姓名</label>
+										<span>刘韬</span>
+									</div>
+
+									<div class="mui-input-row">
+										<label>手机号码</label>
+										<span>15500001111</span>
+									</div>
+									<div class="mui-input-row">
+										<label>身份证号</label>
+										<span>420400199301011010</span>
+									</div>
+									<div class="mui-input-row">
+										<label>入场测温</label>
+										<span class="color55f868">36.3℃</span>
+									</div>
+									<div class="mui-input-row">
+										<label>出场测温</label>
+										<span class="color55f868">36.3℃</span>
+									</div>
+								</form>
+								<form class="mui-input-group mui-content-padded">
+									<div class="mui-input-row">
+										<label>姓名</label>
+										<span>刘韬</span>
+									</div>
+
+									<div class="mui-input-row">
+										<label>手机号码</label>
+										<span>15500001111</span>
+									</div>
+									<div class="mui-input-row">
+										<label>身份证号</label>
+										<span>420400199301011010</span>
+									</div>
+									<div class="mui-input-row">
+										<label>入场测温</label>
+										<span class="color55f868">36.3℃</span>
+									</div>
+									<div class="mui-input-row">
+										<label>出场测温</label>
+										<span class="color55f868">36.3℃</span>
+									</div>
+								</form>
+							</div>
+						</div>
+					</div>
+
+				</div>
+			</div>
+
+		</div>
+	</div>
 </template>
 
 <script>
 </script>
 
+<style scoped src="$project/assets/css/xpwyfyy.css"></style>
 <style>
 </style>

src/projects/business/views/Master/Guest/Invitation.vue

@@ -1,8 +0,0 @@
-<template>
-</template>
-
-<script>
-</script>
-
-<style>
-</style>

src/projects/business/views/Master/Guest/List.vue

@@ -1,8 +1,45 @@
 <template>
+	<div>
+		<header class="mui-bar mui-bar-nav">
+			<h1 class="mui-title">访客记录</h1>
+			<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
+		</header>
+		<div class="mui-content vongi-fklist">
+			<ul class="mui-table-view openfyy-list">
+				<li class="mui-table-view-cell mui-media">
+					<a href="javascript:;" class="mui-navigate-right">
+						远鹏众创空间
+					</a>
+					<div class="mui-ellipsis">
+						来访人员：刘韬
+						<span>访问时间：15:00:00-17:30:00</span>
+					</div>
+					<p class="mui-ellipsis">
+						同行人员：2
+						<span>总计耗时：2小时30分0秒</span>
+					</p>
+				</li>
+				<li class="mui-table-view-cell mui-media">
+					<a href="javascript:;" class="mui-navigate-right">
+						远鹏众创空间
+					</a>
+					<div class="mui-ellipsis">
+						来访人员：刘韬
+						<span>访问时间：15:00:00-17:30:00</span>
+					</div>
+					<p class="mui-ellipsis">
+						同行人员：2
+						<span>总计耗时：2小时30分0秒</span>
+					</p>
+				</li>
+			</ul>
+		</div>
+	</div>
 </template>
 
 <script>
 </script>
 
+<style scoped src="$project/assets/css/xpwyfyy.css"></style>
 <style>
 </style>

src/projects/business/views/Master/Guest/Partner.vue

@@ -1,8 +0,0 @@
-<template>
-</template>
-
-<script>
-</script>
-
-<style>
-</style>