sxyanzhu
/
jhbigscreen
4
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

update code

prv
haha 2024-03-25 00:05:07 +08:00
parent bb2799282c
commit e1c7df7480
7 changed files with 34 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
public/js/mapmodle.js
View File

@ -2,24 +2,24 @@ window.mapModels=[{
prjId:697,
prjName:'泊跃人工智能产业园项目',
modelId:'3a0d8941-4496-e475-c86a-799e8543aca1',
root:'http://szgc.jhncidg.com:808/mapmodel/tools/output/model/202309090700533962/root.glt',
root:'//szgc.jhncidg.com/mapmodel/tools/output/model/202309090700533962/root.glt',
},{
prjId:692,
prjName:'云和悦小区',
modelId:'3a0d876b-fcf5-56ff-0efb-89c065ffa637',
root:'http://szgc.jhncidg.com:808/mapmodel/tools/output/model/202309082236347836/root.glt',
root:'//szgc.jhncidg.com/mapmodel/tools/output/model/202309082236347836/root.glt',
view:{"heading":6.230452905608175,"pitch":-0.3167924920463947,"position":[1.9004702833791862,0.5968788844434487,79.92399569771715],"headingDegrees":356.9786559463691,"pitchDegrees":-18.150872775690118,"positionWC":{"x":-1709632.984691206,"y":4996580.328805909,"z":3564737.175898937}}
},{
prjId:722,
prjName:'泾河新城医疗健康科技产业园一期',
modelId:'3a0d8941-4496-e475-c86a-799e8543aca2',
root:'http://szgc.jhncidg.com:808/mapmodel/tools/output/model/202308292209049711/root.glt',
root:'//szgc.jhncidg.com/mapmodel/tools/output/model/202308292209049711/root.glt',
view:{"heading":0.0058949428144847715,"pitch":-0.45916450787257634,"position":[1.9014402668692727,0.596827472897058,319.1023937950138],"headingDegrees":0.3377553437409484,"pitchDegrees":-26.308188403300086,"positionWC":{"x":-1714602.6283823003,"y":4995280.479264514,"z":3564601.337643737}}
},
{
prjId:736,
prjName:'体育中心',
modelId:'3a0d8941-4496-e475-c86a-799e8543aca3',
root:'http://szgc.jhncidg.com:808/mapmodel/tools/output/model/202308292206163239/root.glt',
root:'//szgc.jhncidg.com/mapmodel/tools/output/model/202308292206163239/root.glt',
view:{"heading":6.283164707709002,"pitch":-0.5236819159300738,"position":[1.9008220777057336,0.5968572306888884,88.94262262738738],"headingDegrees":359.9988197372753,"pitchDegrees":-30.004763590118024,"positionWC":{"x":-1711418.132166834,"y":4996058.815156038,"z":3564628.415878788}}
}];

12
src/api/attendance/index.js
View File

@ -1,6 +1,13 @@
import request from '@/utils/request'
import { Date } from 'core-js'
// 查询劳务实名制管理列表
const listAttendance=(query)=> {
return request({
url: '/project/attendance/list',
method: 'get',
params: query
})
}
const getDeptWorksList=(deptId,projectId)=> {
return request({
url: `bgscreen/attendance/getDeptWorksList?deptId=${deptId||0}&projectId=${projectId||0}`,
@ -51,5 +58,6 @@ export default{
groupByComany,
todayAttendance,
selectList,
groupAllByComany
groupAllByComany,
listAttendance
}

3
src/components/header.vue
View File

@ -413,6 +413,9 @@ export default {
</script>
<style lang="less">
.head-title{
z-index: 9999;
}
.main-header {
.head-title-tab {
.has-submenu {

6
src/components/module/module-one-2-1.js
View File

@ -1,7 +1,7 @@
import Vue from 'vue'
Vue.component('module-one-2-1', {
template:`
<div class="screen-module">
<div class="screen-module" :class="className">
<div class="screen-one-2-1">
<div class="module-title"><span>{{label}}</span></div>
<slot></slot>
@ -11,6 +11,10 @@ Vue.component('module-one-2-1', {
props: {
label:{
type:String
},
className:{
type:String,
default:''
}
},

18
src/pages/components/AttendanceDetailDialog.vue
View File

@ -2,9 +2,9 @@
<MyDialog v-if="show" v-model="show" width="1600px" height="850px" class="today-attendance-detail">
<template slot="title">今日出勤</template>
<div class="head-title-tab" style="padding: 10px 0px;">
<div :class="nav == 1 ? 'head-nav active' : 'head-nav'" @click="doNav(1)">总包人员</div>
<div :class="nav == 8 ? 'head-nav active' : 'head-nav'" @click="doNav(8)">监理人员</div>
<div :class="nav == 2 ? 'head-nav active' : 'head-nav'" @click="doNav(2)">劳务人员</div>
<div :class="nav == 1 ? 'head-nav active' : 'head-nav'" @click="doNav(101)">总包人员</div>
<div :class="nav == 8 ? 'head-nav active' : 'head-nav'" @click="doNav(102)">监理人员</div>
<div :class="nav == 2 ? 'head-nav active' : 'head-nav'" @click="doNav(103)">劳务人员</div>
</div>
<el-table v-loading="loading" :data="tableData" class="mytable" height="650" style="width: 100%;background: transparent;" ref="fbsubordinateUnit">
<el-table-column label="照片" align="center" prop="id">
@ -57,7 +57,7 @@ export default {
size:10,
index:1,
total:0,
nav:1
nav:101
};
},
@ -85,15 +85,15 @@ export default {
},
loadData(){
let postData={
attendanceTime:this.$dt(new Date()).format("YYYY-MM-DD"),
projectId:this.projectId,
deptId:this.deptId,
size:this.size,
index:this.index,
id:this.nav
pageSize:this.size,
pageNum:this.index,
companyTypeId:this.nav
}
this.tableData=[];
this.loading=true;
this.$api.attendance.todayAttendance(postData).then(d=>{
this.$api.attendance.listAttendance(postData).then(d=>{
this.total=d.total||0;
this.tableData=(d.rows||[]).map(it=>{
it.scanPhoto=it.scanPhoto && it.scanPhoto.indexOf("/profile")==0?"/jhapi"+it.scanPhoto:it.scanPhoto;

2
src/pages/index/mapIndex.vue
View File

@ -43,7 +43,7 @@ export default {
},
reloadMap() {
this.mapInfo = {
root: "http://szgc.jhncidg.com:808/mapmodel/tools/output/model/202310241728566044/root.glt",
root: "//szgc.jhncidg.com/mapmodel/tools/output/model/202310241728566044/root.glt",
modelId: '3a0e7366-ad7b-3dc3-1d86-2331fc1e8578',
view:{"heading":4.8798740228358,"pitch":-0.22637630756730465,"position":[1.9366836920898733,0.5884137486301345,31809.670937187617],"headingDegrees":279.59618606401807,"pitchDegrees":-12.970407005361997,"positionWC":{"x":-1909610.0164615875,"y":4984113.66041506,"z":3537723.8441370176}}
};

1
src/utils/dayfilter.js
View File

@ -8,7 +8,6 @@ const filters={
return "";
},
formatTime:dt=>{
console.log(">>>>>>>>>>",dt)
if(dt){
return dayjs(dt).format("HH:mm:ss");
}