Skip to content

W
WX_h5
Commit e1ee5b93 authored by godwithdh's avatar godwithdh
Browse files
Options

Merge branch 'master' of http://47.110.145.204:8085/godwithdh/wx_h5

parents cec9787d db733ec4
Expand all Show whitespace changes
Inline Side-by-side
Showing with 504 additions and 411 deletions
src/App.vue
View file @ e1ee5b93
<template> <template>
<div id="app"> <div id="app">
<v-app> <v-app>
<keep-alive> <keep-alive >
<router-view v-wechat-title="$route.meta.title"/> <router-view v-wechat-title="$route.meta.title"/>
</keep-alive> </keep-alive>
</v-app> </v-app>
......
src/router/health.js
View file @ e1ee5b93
...@@ -96,7 +96,7 @@ module.exports = [ ...@@ -96,7 +96,7 @@ module.exports = [
meta:{ meta:{
title: '返程统计', title: '返程统计',
showTabbar:true, showTabbar:true,
activeTab:1 activeTab:2
} }
}, },
] ]
......
src/view/healthCard/index.vue
View file @ e1ee5b93
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<div class="vApp"> <div class="vApp">
<div class="keepAlive"> <div class="keepAlive">
<keep-alive> <keep-alive>
<router-view></router-view> <router-view ></router-view>
</keep-alive> </keep-alive>
</div> </div>
<div class="TABBAR" v-if="showTabbar"> <div class="TABBAR" v-if="showTabbar">
...@@ -147,6 +147,7 @@ export default { ...@@ -147,6 +147,7 @@ export default {
if(result && result.length > 0){ if(result && result.length > 0){
result[0].iEmploeeId = result[0].iIden; result[0].iEmploeeId = result[0].iIden;
result[0].openId = result[0].sCreateAppid; result[0].openId = result[0].sCreateAppid;
result[0].bBackFromother = result[0].bBackFromother ? 'true' : 'false';
this.$store.dispatch('saveHealthBaseData',result[0]); this.$store.dispatch('saveHealthBaseData',result[0]);
} }
} }
......
src/view/healthCard/returnTrack/chart.vue
View file @ e1ee5b93
This diff is collapsed.
src/view/healthCard/returnTrack/index.vue
View file @ e1ee5b93
...@@ -149,24 +149,24 @@ ...@@ -149,24 +149,24 @@
</style> </style>
<template> <template>
<div id="healthCardReturnTrack"> <div id="healthCardReturnTrack">
<div class="editArea" v-if="showEditArea"> <div class="editArea" v-if="showEditArea && !readOnly">
<i class='iconfont icon-banben'></i> <i class='iconfont icon-banben'></i>
<span>表单已填写</span> <span>表单已填写</span>
<div class="editBtn"> <div class="editBtn">
<span @click="edit">我要修改</span> <span @click="edit">我要修改</span>
</div> </div>
</div> </div>
<div class="iCard" :style="{'margin-bottom':'10px','margin-top':showEditArea ? '0' : '8px'}"> <div class="iCard" :style="{'margin-bottom':'10px','margin-top':showEditArea && !readOnly ? '0' : '8px'}">
<div class="list"> <div class="list">
<div class="tip">1. 是否从其他城市返回<span style="color:red;">*</span></div> <div class="tip">1. 是否从其他城市返回<span style="color:red;">*</span></div>
<v-radio-group v-model="baseData.bBackFromother" :disabled="!!baseData.bBackFromother" @change="changeRadio"> <v-radio-group v-model="baseData.bBackFromother" :disabled="baseData.bBackFromother == 'true' ? (showEditArea || submitForm.length > 0) : showEditArea" @change="changeRadio">
<div style="margin-bottom:10px;"><v-radio value="1" label="从其他城市返回"/></div> <div style="margin-bottom:10px;"><v-radio value="true" label="从其他城市返回"/></div>
<div><v-radio value="0" label="一直在工作地，无需返程"/></div> <div><v-radio value="false" label="一直在工作地，无需返程"/></div>
</v-radio-group> </v-radio-group>
</div> </div>
</div> </div>
<div class="CONTENT" v-if="baseData.bBackFromother"> <div class="CONTENT" v-if="baseData.bBackFromother">
<div v-for="(item,index) in filterSubmitForm" :key="index" > <div v-for="(item,index) in submitForm" :key="index" >
<div class="deleteArea"> <div class="deleteArea">
<span style="color:#3399ff;">返回统计（{{index + 1}}）</span> <span style="color:#3399ff;">返回统计（{{index + 1}}）</span>
<span style="color:#ff6600;" @click="del(index)" v-if="!showEditArea">删除</span> <span style="color:#ff6600;" @click="del(index)" v-if="!showEditArea">删除</span>
...@@ -242,7 +242,7 @@ ...@@ -242,7 +242,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="addBtn" @click="add" v-if="!showEditArea"> <div class="addBtn" @click="add" v-if="!showEditArea && baseData.bBackFromother == 'true'">
<i class='iconfont icon-jia1'></i> <i class='iconfont icon-jia1'></i>
</div> </div>
</div> </div>
...@@ -279,33 +279,70 @@ export default { ...@@ -279,33 +279,70 @@ export default {
submitForm:[], submitForm:[],
isDisabled:false, isDisabled:false,
isOtherCityReturn:'', isOtherCityReturn:'',
list:list() list:list(),
baseData:{},
readOnly:false
} }
}, },
computed:{ computed:{
...mapState({ ...mapState({
baseData:state => state.healthStatistics.baseData,
}), })
filterSubmitForm(){
return this.submitForm.filter(x=>x.iStatus != 3);
}
}, },
async activated(){ async activated(){
if (window.history && window.history.pushState) {
// 往历史记录里面添加一条新的当前页面的url
history.pushState(null, null, document.URL);
// 给 popstate 绑定一个方法 监听页面刷新
window.addEventListener('popstate', this.backChange, false);//false阻止默认事件
}
window.d = this; window.d = this;
this.$store.dispatch('saveHealthStatisticsOpen',this.$route.query.openId); this.$store.dispatch('saveHealthStatisticsOpen',this.$route.query.openId);
if(this.$route.query.hasOwnProperty('readOnly')){
this.readOnly = this.$route.query.readOnly;
}else{
this.readOnly = false;
}
await this.getHealthcompany();
await this.getHealthData(); await this.getHealthData();
}, },
methods:{ methods:{
async getHealthcompany(){
let result = await this.request('getHealthcompany',{
data:[
{key: "url", value: "check_bhavecompany"},
{key: "openid", value: this.$route.query.openId}
]
})
if(result && result.length > 0){
result[0].iEmploeeId = result[0].iIden;
result[0].openId = result[0].sCreateAppid;
result[0].bBackFromother = result[0].bBackFromother ? 'true' : 'false';
this.baseData = result[0];
}
},
backChange() {
const that = this;
wx.miniProgram.switchTab({
url:'/pages/home'
})
},
changeRadio(e){ changeRadio(e){
let data = util.deepClone(this.baseData); let data = util.deepClone(this.baseData);
this.request('saveHealthemploee',{ this.request('saveHealthemploee',{
data:{ data:{
iIden:data.iIden, iIden:data.iIden,
iStatus:2, iStatus:2,
bBackFromother:e == '1' ? true : false bBackFromother:e == 'true' ? true : false
} }
}).then(res=>{ }).then(res=>{
data.bBackFromother = e; data.bBackFromother = e;
if(e == 'true'){
let data = list();
data.iCompanyId = this.baseData.iCompanyId;
data.iEmploeeId = this.baseData.iEmploeeId;
this.submitForm.push(data);
}
this.$store.dispatch('saveHealthBaseData',data); this.$store.dispatch('saveHealthBaseData',data);
}) })
}, },
...@@ -313,7 +350,7 @@ export default { ...@@ -313,7 +350,7 @@ export default {
let res = await this.request('getHealthbacklog',{ let res = await this.request('getHealthbacklog',{
data:[ data:[
{key:'url',value:'HealthBackLog'}, {key:'url',value:'HealthBackLog'},
{key:'iEmploeeId',value: this.$route.params.iEmploeeId}, {key:'iEmploeeId',value: this.baseData.iEmploeeId},
], ],
params:{}, params:{},
},'加载中',{}); },'加载中',{});
...@@ -327,17 +364,19 @@ export default { ...@@ -327,17 +364,19 @@ export default {
this.isDisabled = true; this.isDisabled = true;
this.showEditArea = true; this.showEditArea = true;
}else{ }else{
if(this.baseData.bBackFromother == 'true'){
let data = list(); let data = list();
data.iCompanyId = this.$route.params.iCompanyId; data.iCompanyId = this.baseData.iCompanyId;
data.iEmploeeId = this.$route.params.iEmploeeId; data.iEmploeeId = this.baseData.iEmploeeId;
this.submitForm.push(data); this.submitForm.push(data);
} }
} }
}
}, },
add(){ add(){
let data = list(); let data = list();
data.iCompanyId = this.$route.params.iCompanyId; data.iCompanyId = this.baseData.iCompanyId;
data.iEmploeeId = this.$route.params.iEmploeeId; data.iEmploeeId = this.baseData.iEmploeeId;
this.submitForm.push(data); this.submitForm.push(data);
}, },
edit(){ edit(){
...@@ -369,13 +408,19 @@ export default { ...@@ -369,13 +408,19 @@ export default {
del(index){ del(index){
this.$vux.confirm.show({ this.$vux.confirm.show({
title:"提示", title:"提示",
content:'是否删除？', content:'该数据将永久删除，是否删除？',
showCancelButton:true, showCancelButton:true,
onConfirm :()=> { onConfirm :async ()=> {
if(this.submitForm[index].iStatus == 1){ if(this.submitForm[index].iStatus == 1){
this.submitForm.splice(index,1); this.submitForm.splice(index,1);
}else if(this.submitForm[index].iStatus == 2){ }else if(this.submitForm[index].iStatus == 2){
this.submitForm[index].iStatus = 3; let res = await this.request('saveHealthbacklog',{
data:[Object.assign(this.submitForm[index],{iStatus:3})],
params:{},
},'加载中',{});
if(res.iStatus == 1){
this.submitForm.splice(index,1);
}
} }
}, },
onCancel () {} onCancel () {}
...@@ -411,5 +456,8 @@ export default { ...@@ -411,5 +456,8 @@ export default {
return true; return true;
} }
}, },
deactivated(){
window.removeEventListener('popstate', this.backChange, false);//false阻止默认事件
}
} }
</script> </script>
\ No newline at end of file
src/view/healthCard/statistics/index.vue
View file @ e1ee5b93
This diff is collapsed.
src/view/healthCard/statistics/temp.vue
View file @ e1ee5b93
...@@ -5,70 +5,54 @@ ...@@ -5,70 +5,54 @@
height:100%; height:100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
.items{
flex-grow:1;
height:1px;
overflow: auto; overflow: auto;
-webkit-overflow-scrolling: touch; -webkit-overflow-scrolling: touch;
.iCard{
margin:10px 15px;
padding:0 10px;
.HEAD{
height:40px;
line-height: 40px;
border-bottom: 1px solid #EDF4FF;
font-size: 18px;
font-weight: bold;
}
}
.statisics{
.CONTENT{
display: flex;
flex-wrap: wrap;
padding-top: 10px;
overflow-y: scroll;
-webkit-overflow-scrolling: touch;
.item{ .item{
margin:15px 15px 0 15px;
.HEAD{
border-top-left-radius: 6px;
border-top-right-radius: 6px;
background: #6b9bf7;
height:60px;
display: flex; display: flex;
justify-content: center;
align-items: center;
flex-wrap: wrap;
margin-bottom:10px;
.DATE{
width:70%;
height:40px;
border-radius: 50%;
margin-bottom:5px;
border:4px solid #2d8cf0;
border-left-color: transparent;
display: flex;
justify-content: center;
align-items: center; align-items: center;
transform: rotate(45deg); padding:0 10px;
>div{ .left{
transform: rotate(-45deg); flex:1;
font-size:12px; color:white;
} font-size:18px;
font-weight: bold;
} }
.DATE1{ .right{
flex:1;
text-align: right;
display:flex;
flex-wrap: wrap;
div{
width:100%; width:100%;
text-align: center; color:white;
}
} }
.img{ .month{
width:100%; font-size:14px;
display: flex;
justify-content: center;
img{
width:100%;
height:300px;
} }
.day{
font-size:18px;
font-weight: bold;
} }
} }
} }
.returnTrack{
.CONTENT{ .CONTENT{
border-bottom-left-radius: 6px;
border-bottom-right-radius: 6px;
border:2px solid #6b9bf7;
border-top:0;
padding:10px;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
margin:20px 0;
.left,.right,.center{ .left,.right,.center{
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
...@@ -89,11 +73,19 @@ ...@@ -89,11 +73,19 @@
} }
} }
} }
.FOOTER{
text-align: center;
>button{
width:200px !important;
} }
.item:last-child{
margin-bottom:15px;
}
}
.img{
width:100%;
display: flex;
justify-content: center;
img{
width:100%;
height:300px;
} }
} }
.btn{ .btn{
...@@ -109,72 +101,48 @@ ...@@ -109,72 +101,48 @@
font-size:14px; font-size:14px;
} }
} }
@media screen and (max-width:500px){
.item,.DATE1{
width:25%;
}
}
@media screen and (min-width:500px) and (max-width:2000px){
.item,.DATE1{
width:10%;
}
}
} }
</style> </style>
<template> <template>
<div id="healthCardStatisticsIndex"> <div id="healthCardStatisticsIndex">
<div class="statisics"> <div class="items" v-if="list.length > 0">
<div class="iCard"> <div class="item" v-for="(item,index) in list" :key="index" @click="routerToChart(item)" >
<div class="HEAD"> <div class="HEAD" >
每日健康统计 <div class="left">
</div> <span>{{item.iAllJoin}}/{{item.iAll}}</span>
<div class="CONTENT" :style="{'max-height':cardH + 'px'}">
<div class="item" v-for="(item,index) in list" :key="index" @click="routerToChart(item)" v-if="list.length > 0" ref="item" :style="{'height':itemH + 'px'}">
<div class="DATE" ref="date" :style="{'height':h+'px'}">
<div>
<span style="font-weight:bold;">{{item.iAll}}</span><span>/{{item.iAllJoin}}</span>
</div>
</div>
<div class="DATE1" style="height:18px;">{{item.dDate}}</div>
</div>
</div>
</div> </div>
<div class="img" v-if="list.length <= 0"> <div class="right">
<img src="@/assets/noData.jpg" class="_img" alt=""> <div class="day">{{item.iDay}}</div>
<div class="month">{{item.sMonth}}</div>
</div> </div>
</div> </div>
<div class="btn" v-if="list.length > 0">
<!-- <span v-show="false" id="copyUrl">{{copyUrl}}</span> -->
<button @click="exportExcel" class="copy" :data-clipboard-text="copyUrl">导出excel</button>
</div>
<div class="returnTrack">
<div class="iCard">
<div class="HEAD">
员工返程统计
</div>
<div class="CONTENT"> <div class="CONTENT">
<div class="left"> <div class="left">
<div class="n">{{returnTrack.bBackFromotherAll || 0}}</div> <div class="n">{{item.iAll}}</div>
<div class="t">应参与人员</div> <div class="t">应参与人员</div>
</div> </div>
<div class="center"> <div class="center">
<div class="n">{{returnTrack.bBackFromotherTrue || 0}}</div> <div class="n">{{item.iAllJoin}}</div>
<div class="t">已参与人员</div> <div class="t">已参与人员</div>
</div> </div>
<div class="right"> <div class="right">
<div class="n">{{returnTrack.bBackFromotherFalse || 0}}</div> <div class="n">{{item.iAllNotJoin}}</div>
<div class="t">未参与人员</div> <div class="t">未参与人员</div>
</div> </div>
</div> </div>
<div class="FOOTER btn">
<button @click="routerToReturnChart">查看详情</button>
</div> </div>
</div> </div>
<div class="img" v-if="list.length <= 0">
<img src="@/assets/noData.jpg" class="_img" alt="">
</div> </div>
<div class="btn" v-if="list.length > 0">
<!-- <span v-show="false" id="copyUrl">{{copyUrl}}</span> -->
<button @click="exportExcel" class="copy" :data-clipboard-text="copyUrl">导出excel</button>
</div>
</div> </div>
</template> </template>
...@@ -190,11 +158,7 @@ export default { ...@@ -190,11 +158,7 @@ export default {
return { return {
list:[], list:[],
openId:'', openId:'',
copyUrl:'', copyUrl:''
h:0,
cardH:0,
itemH:0,
returnTrack:{}
} }
}, },
components:{ components:{
...@@ -208,30 +172,28 @@ export default { ...@@ -208,30 +172,28 @@ export default {
async mounted(){ async mounted(){
this.openId=this.$route.query.openId; this.openId=this.$route.query.openId;
this.$store.dispatch('saveHealthStatisticsOpen',this.openId); this.$store.dispatch('saveHealthStatisticsOpen',this.openId);
window.addEventListener("resize", this.renderResize, false)
}, },
async activated(){ async activated(){
window.d = this; window.d = this;
await this.getData(); await this.getData();
await this.getReturnTrack();
this.renderResize(); // axios({
}, // method: 'get',
beforeDestroy () { // url:'https://weixin.huansi.net/apiproxy/huansi/service/proxy/1227787695263191040/sendmessage/excel/?iCompanyID=1382&t=0.34324224',
// 移除监听 // responseType: 'blob'
window.removeEventListener("resize", this.renderResize, false) // })
// .then(data => {
// let url = window.URL.createObjectURL(data.data)
// let link = document.createElement('a')
// link.style.display = 'none'
// link.href = url
// console.log(url)
// link.setAttribute('download', 'product.xls')
// document.body.appendChild(link)
// link.click()
// })
}, },
methods:{ methods:{
renderResize() {
if(this.list.length > 0){
let ref = this.$refs['date'][0];
this.h = ref.offsetWidth;
this.$nextTick(()=>{
let item = this.$refs['item'][0];
this.itemH = this.h + 18 + 5;
this.cardH = this.itemH * 2 + 30;
})
}
},
async getData(){ async getData(){
let res = await this.request('getStatisticalDetails',{ let res = await this.request('getStatisticalDetails',{
data:[ data:[
...@@ -261,21 +223,6 @@ export default { ...@@ -261,21 +223,6 @@ export default {
showCancelButton:false, showCancelButton:false,
}) })
},1000) },1000)
},
async getReturnTrack(){
let res = await this.request('getHealthbacklog',{
data:[
{key:'url',value:'statistical_details_data'},
{key:'iCompanyId',value: '1382'}
],
params:{},
},'加载中',{});
if(Util.getType(res) == 'object') {
this.returnTrack = res.set1[0];
}
},
routerToReturnChart(){
this.$router.push({name:'healthCardReturnTrackChart'});
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment