公司读取调整

src/projects/business/components/GreenCode.vue

@@ -260,7 +260,7 @@
 		computed: {
 			...mapGetters({
 				person_data: 'person_data',
-				company_data: 'company_data',
+                person_popedom: 'person_popedom',
 			})
 		},
 		watch: {}

src/projects/business/views/Common/Health/Cert.vue

@@ -379,7 +379,7 @@
 				openId: 'wx_openid',
 				token: 'token',
 				person_data: 'person_data',
-				company_data: 'company_data',
+                person_popedom: 'person_popedom',
 			})
 		}
 	}

src/projects/business/views/Common/Health/TemperatureInfo.vue

@@ -104,7 +104,7 @@
 				openId: 'wx_openid',
 				token: 'token',
 				person_data: 'person_data',
-				company_data: 'company_data',
+                person_popedom: 'person_popedom',
 			})
 		}
 	}

src/projects/business/views/Common/Health/TemperatureRecord.vue

@@ -137,7 +137,7 @@
 				openId: 'wx_openid',
 				token: 'token',
 				person_data: 'person_data',
-				company_data: 'company_data',
+                person_popedom: 'person_popedom',
 			})
 		},
 		watch: {

src/projects/business/views/HouseKeeper/Admin/Attendance/List.vue

@@ -188,7 +188,7 @@
 				openId: 'wx_openid',
 				token: 'token',
 				person_data: 'person_data',
-				company_data: 'company_data',
+                person_popedom: 'person_popedom',
 			})
 		}
 	}

src/projects/business/views/HouseKeeper/Admin/Attendance/TemperatureInfo.vue

@@ -104,7 +104,7 @@
 				openId: 'wx_openid',
 				token: 'token',
 				person_data: 'person_data',
-				company_data: 'company_data',
+                person_popedom: 'person_popedom',
 			})
 		}
 	}

src/projects/business/views/HouseKeeper/Admin/Center.vue

@@ -128,7 +128,7 @@
 				openId: 'wx_openid',
 				token: 'token',
 				person_data: 'person_data',
-				company_data: 'company_data',
+                person_popedom: 'person_popedom',
 			})
 		}
 	}

src/projects/business/views/HouseKeeper/Admin/Health/AbnormalRecord.vue

@@ -5,7 +5,7 @@
 
 		<div class="mui-content fyy-date">
 			<div class="mui-content-padded fyy-date mui-clearfix">
-				<h5>{{company_data.name}}
+				<h5>{{person_data.companyName}}
 					<a class="mui-navigate-right mui-pull-right" @click="selectData">{{listForm.queryDate}}</a>
 				</h5>
 			</div>
@@ -161,7 +161,7 @@
 				openId: 'wx_openid',
 				token: 'token',
 				person_data: 'person_data',
-				company_data: 'company_data',
+                person_popedom: 'person_popedom',
 			})
 		}
 	}

src/projects/business/views/HouseKeeper/Admin/Health/Archives.vue

@@ -172,7 +172,7 @@
 				openId: 'wx_openid',
 				token: 'token',
 				person_data: 'person_data',
-				company_data: 'company_data',
+                person_popedom: 'person_popedom',
 			})
 		}
 	}

src/projects/business/views/HouseKeeper/Admin/Health/NoTemperatureRecord.vue

@@ -70,7 +70,7 @@
 			}
 		},
 		created() {
-			this.subForm.companyId = this.company_data.id;
+			this.subForm.companyId = this.person_data.companyId;
 			this.subForm.queryDate = parseUnixTime(currentTimeStamp(), '{y}-{m}-{d}');
 		},
 		methods: {
@@ -117,7 +117,7 @@
 				openId: 'wx_openid',
 				token: 'token',
 				person_data: 'person_data',
-				company_data: 'company_data',
+                person_popedom: 'person_popedom',
 			})
 		}
 	}

src/projects/business/views/HouseKeeper/Admin/Health/TemperatureRecord.vue

@@ -5,7 +5,7 @@
 
 		<div class="mui-content fyy-date">
 			<div class="mui-content-padded fyy-date mui-clearfix">
-				<h5>{{company_data.name}}
+				<h5>{{person_data.companyName}}
 					<a class="mui-navigate-right mui-pull-right" @click="selectData">{{listForm.queryDate}}</a>
 				</h5>
 			</div>
@@ -161,7 +161,7 @@
 				openId: 'wx_openid',
 				token: 'token',
 				person_data: 'person_data',
-				company_data: 'company_data',
+                person_popedom: 'person_popedom',
 			})
 		}
 	}

src/projects/business/views/HouseKeeper/Admin/Home.vue

@@ -230,7 +230,7 @@
 				openId: 'wx_openid',
 				token: 'token',
 				person_data: 'person_data',
-				company_data: 'company_data',
+                person_popedom: 'person_popedom',
 			})
 		}
 	}

src/projects/business/views/HouseKeeper/Admin/Message.vue

@@ -118,7 +118,7 @@
 				openId: 'wx_openid',
 				token: 'token',
 				person_data: 'person_data',
-				company_data: 'company_data',
+                person_popedom: 'person_popedom',
 			})
 		}
 	}

src/projects/business/views/HouseKeeper/Control/Health/AbnormalRecord.vue

@@ -5,7 +5,7 @@
 
 		<div class="mui-content fyy-date">
 			<div class="mui-content-padded fyy-date mui-clearfix">
-				<h5>{{company_data.name}}
+				<h5>{{person_data.companyName}}
 					<a class="mui-navigate-right mui-pull-right" @click="selectData">{{listForm.queryDate}}</a>
 				</h5>
 			</div>
@@ -80,7 +80,7 @@
 			if(this.$route.query.companyId){
 				this.listForm.companyId  = this.$route.query.companyId;
 			}else{
-				this.listForm.companyId = this.company_data.id;
+				this.listForm.companyId = this.person_data.companyId;
 			}
 
 			if (this.$route.query.queryDate) {
@@ -169,7 +169,7 @@
 				openId: 'wx_openid',
 				token: 'token',
 				person_data: 'person_data',
-				company_data: 'company_data',
+                person_popedom: 'person_popedom',
 			})
 		}
 	}

src/projects/business/views/HouseKeeper/Control/Health/NoTemperatureRecord.vue

@@ -73,7 +73,7 @@
 			if(this.$route.query.companyId){
 				this.subForm.companyId  = this.$route.query.companyId;
 			}else{
-				this.subForm.companyId = this.company_data.id;
+				this.subForm.companyId = this.person_data.companyId;
  			}
 
 			this.subForm.queryDate = parseUnixTime(currentTimeStamp(), '{y}-{m}-{d}');
@@ -122,7 +122,7 @@
 				openId: 'wx_openid',
 				token: 'token',
 				person_data: 'person_data',
-				company_data: 'company_data',
+                person_popedom: 'person_popedom',
 			})
 		}
 	}

src/projects/business/views/HouseKeeper/Control/Health/Worker.vue

@@ -5,7 +5,7 @@
 
 	<div class="mui-content fyy-wall vongi-zgtz">
 			<div class="mui-content-padded fyy-date mui-clearfix">
-				<h5>{{company_data.name}}
+				<h5>{{person_data.companyName}}
 					<a  class="mui-navigate-right mui-pull-right" v-html="curDate" @click="selectDate()">2020-03-19</a>
 				</h5>
 			</div>
@@ -276,7 +276,7 @@
 			pageList(status, index) {
 				return API_ControlHealth.workerPageList({
 					setinput: this.setinput,
-					companyId: this.company_data.id,
+					companyId: this.person_data.companyId,
 					queryDate: this.curDate,
 					status: status,
 					pageIndex: index,
@@ -322,7 +322,7 @@
 			//获取绿码统计数据
 			getHealthyCodeStat() {
 				this.isLoading = true;
-				API_ControlHealth.getHealthyCodeStat(this.company_data.id,'3').then(response => {
+				API_ControlHealth.getHealthyCodeStat(this.person_data.companyId,'3').then(response => {
 					this.isLoading = false;
 					this.statList = response;
 				}).catch(error => {
@@ -349,7 +349,7 @@
 				openId: 'wx_openid',
 				token: 'token',
 				person_data: 'person_data',
-				company_data: 'company_data',
+                person_popedom: 'person_popedom',
 			})
 		}
 	}

src/projects/business/views/HouseKeeper/Control/Health/WorkerInfo.vue

@@ -147,7 +147,7 @@
 				openId: 'wx_openid',
 				token: 'token',
 				person_data: 'person_data',
-				company_data: 'company_data',
+                person_popedom: 'person_popedom',
 			})
 		}
 	}

src/projects/business/views/HouseKeeper/Control/Health/WorkerTemperature.vue

@@ -83,8 +83,8 @@
 				this.companyName=unescape(this.$route.query.companyName);
 
 			}else{
-				this.listForm.companyId = this.company_data.id;
-				this.companyName=this.company_data.name;
+				this.listForm.companyId = this.person_data.companyId;
+				this.companyName=this.person_data.companyName;
 			}
 
 			if (this.$route.query.queryDate) {
@@ -174,7 +174,7 @@
 				openId: 'wx_openid',
 				token: 'token',
 				person_data: 'person_data',
-				company_data: 'company_data',
+                person_popedom: 'person_popedom',
 			})
 		}
 	}

src/projects/business/views/HouseKeeper/Control/Home.vue

@@ -175,7 +175,7 @@
 				openId: 'wx_openid',
 				token: 'token',
 				person_data: 'person_data',
-				company_data: 'company_data',
+                person_popedom: 'person_popedom',
 			})
 		}
 	}

src/projects/business/views/Master/Center.vue

@@ -147,7 +147,7 @@
 				openId: 'wx_openid',
 				token: 'token',
 				person_data: 'person_data',
-				company_data: 'company_data',
+                person_popedom: 'person_popedom',
 			})
 		}
 	}

src/projects/business/views/Master/EditInfo.vue

@@ -188,7 +188,7 @@
 				openId: 'wx_openid',
 				token: 'token',
 				person_data: 'person_data',
-				company_data: 'company_data',
+                person_popedom: 'person_popedom',
 			})
 		}
 	}

src/projects/business/views/Master/Health/Report.vue

@@ -89,7 +89,7 @@
 				openId: 'wx_openid',
 				token: 'token',
 				person_data: 'person_data',
-				company_data: 'company_data',
+                person_popedom: 'person_popedom',
 			})
 		}
 	}

src/projects/business/views/Master/Home.vue

@@ -254,7 +254,7 @@
 				openId: 'wx_openid',
 				token: 'token',
 				person_data: 'person_data',
-				company_data: 'company_data',
+                person_popedom: 'person_popedom',
 			})
 		}
 	}

src/projects/business/views/Master/Message.vue

@@ -118,7 +118,7 @@
 				openId: 'wx_openid',
 				token: 'token',
 				person_data: 'person_data',
-				company_data: 'company_data',
+                person_popedom: 'person_popedom',
 			})
 		}
 	}

src/projects/home/views/Home.vue

@@ -123,7 +123,7 @@
 				openId: 'wx_openid',
 				token: 'token',
 				person_data: 'person_data',
-				company_data: 'company_data',
+                person_popedom: 'person_popedom',
 				vister_scene: 'vister_scene',
 			})
 		}

src/projects/home/views/User/Login.vue

@@ -183,7 +183,7 @@
 				openId: 'wx_openid',
 				token: 'token',
 				person_data: 'person_data',
-				company_data: 'company_data',
+                person_popedom: 'person_popedom',
 				vister_scene: 'vister_scene',
 			})
 		}

src/projects/home/views/User/Role.vue

@@ -152,7 +152,7 @@
 				openId: 'wx_openid',
 				token: 'token',
 				person_data: 'person_data',
-				company_data: 'company_data',
+                person_popedom: 'person_popedom',
 				vister_scene: 'vister_scene',
 			})
 		}

src/projects/home/views/Wx/About/Contact.vue

@@ -51,7 +51,7 @@
 				openId: 'wx_openid',
 				token: 'token',
 				person_data: 'person_data',
-				company_data: 'company_data',
+                person_popedom: 'person_popedom',
 				vister_scene: 'vister_scene',
 			})
 		}

src/projects/home/views/Wx/Activity/Form.vue

@@ -51,7 +51,7 @@
 				openId: 'wx_openid',
 				token: 'token',
 				person_data: 'person_data',
-				company_data: 'company_data',
+                person_popedom: 'person_popedom',
 				vister_scene: 'vister_scene',
 			})
 		}

src/projects/home/views/Wx/Activity/Info.vue

@@ -51,7 +51,7 @@
 				openId: 'wx_openid',
 				token: 'token',
 				person_data: 'person_data',
-				company_data: 'company_data',
+                person_popedom: 'person_popedom',
 				vister_scene: 'vister_scene',
 			})
 		}

src/projects/home/views/Wx/Activity/List.vue

@@ -51,7 +51,7 @@
 				openId: 'wx_openid',
 				token: 'token',
 				person_data: 'person_data',
-				company_data: 'company_data',
+                person_popedom: 'person_popedom',
 				vister_scene: 'vister_scene',
 			})
 		}

src/projects/home/views/Wx/Activity/MyList.vue

@@ -51,7 +51,7 @@
 				openId: 'wx_openid',
 				token: 'token',
 				person_data: 'person_data',
-				company_data: 'company_data',
+                person_popedom: 'person_popedom',
 				vister_scene: 'vister_scene',
 			})
 		}

src/store/getters.js

@@ -4,8 +4,8 @@ export const wx_openid = state => state.wx_openid
 
 export const person_data = state => state.person_data
 
-export const company_data = state => state.company_data
+export const person_popedom = state => state.person_popedom
 
 export const vister_scene = state => state.vister_scene
 
-export const add_person_data = state => state.add_person_data
+export const add_person_data = state => state.add_person_data

src/store/mutation-types.js

@@ -2,6 +2,6 @@ export const SET_TOKEN = 'SET_TOKEN'
 export const SET_WEIXIN_OPENID = 'SET_WEIXIN_OPEN_ID'
 
 export const SET_PERSON_DATA = 'SET_PERSON_DATA'
-export const SET_COMPANY_DATA = 'SET_COMPANY_DATA'
+export const SET_PERSON_POPEDOM = 'SET_PERSON_POPEDOM'
 export const SET_VISTER_SCENE = 'SET_VISTER_SCENE'
 export const SET_ADD_PERSON_DATA = 'SET_ADD_PERSON_DATA'

src/store/mutations.js

@@ -3,7 +3,7 @@ import {
 	setOpenId,
 	setToken,
 	setPersonData,
-	setCompanyData,
+	setPersonPopedom,
 	setVisterScene
 } from '../utils/storage'
 
@@ -25,9 +25,9 @@ const mutations = {
 		state.person_data = data
 	},
 
-	[types.SET_COMPANY_DATA](state, data) {
-		setCompanyData(storage_prefix, data)
-		state.company_data = data
+	[types.SET_PERSON_POPEDOM](state, data) {
+		setPersonPopedom(storage_prefix, data)
+		state.person_popedom = data
 	},
 
 	[types.SET_VISTER_SCENE](state, data) {
@@ -38,10 +38,10 @@ const mutations = {
 	[types.SET_ADD_PERSON_DATA](state, data) {
 		state.add_person_data = data
 	},
-	setControlAbnormalStatisticsStartTime(state,data){
+	setControlAbnormalStatisticsStartTime(state, data) {
 		state.control_abnormal_statistics_startTime = data
 	},
-	setControlAbnormalStatisticsEndTime(state,data){
+	setControlAbnormalStatisticsEndTime(state, data) {
 		state.control_abnormal_statistics_endTime = data
 	}
 }

src/store/state.js

@@ -2,7 +2,7 @@ import {
 	getOpenId,
 	getToken,
 	getPersonData,
-	getCompanyData,
+	getPersonPopedom,
 	getVisterScene
 } from '../utils/storage'
 
@@ -12,11 +12,11 @@ const state = {
 	wx_openid: getOpenId(),
 	token: getToken(),
 	person_data: getPersonData(storage_prefix),
-	company_data: getCompanyData(storage_prefix),
+	person_popedom: getPersonPopedom(storage_prefix),
 	vister_scene: getVisterScene(storage_prefix),
 	add_person_data: '',
-	control_abnormal_statistics_startTime:'',
-	control_abnormal_statistics_endTime:'',
+	control_abnormal_statistics_startTime: '',
+	control_abnormal_statistics_endTime: '',
 }
 
 export default state

src/utils/storage.js

@@ -62,9 +62,9 @@ export const setPersonData = (channel, data) => set(channel + '_person_data', da
 
 export const getPersonData = (channel) => get(channel + '_person_data')
 
-export const setCompanyData = (channel, data) => set(channel + '_company_data', data)
+export const setPersonPopedom = (channel, data) => set(channel + '_person_popedom', data)
 
-export const getCompanyData = (channel) => get(channel + '_company_data')
+export const getPersonPopedom = (channel) => get(channel + '_person_popedom')
 
 export const setVisterScene = (channel, data) => set(channel + '_vister_scene', data)