Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhbigscreen into dev
commit
b14234d128
|
@ -3400,7 +3400,13 @@ table{
|
|||
.quality-table .el-table::before{
|
||||
background: none;
|
||||
}
|
||||
|
||||
.quality-table .el-table__footer-wrapper tbody td.el-table__cell{
|
||||
background: none ;
|
||||
color: #fff ;
|
||||
font-weight: bold;
|
||||
font-size:16px;
|
||||
border-bottom: solid 1px rgba(60, 170, 255, 0.3);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
|
10
src/App.vue
10
src/App.vue
|
@ -4,8 +4,8 @@
|
|||
<background-video></background-video>
|
||||
<!--大屏内容-->
|
||||
<div class="screen-content-max">
|
||||
<screen-header :nav="1"></screen-header>
|
||||
<div>
|
||||
<screen-header :nav="1" v-if="!isMap"></screen-header>
|
||||
<div class="main-app">
|
||||
<router-view />
|
||||
</div>
|
||||
</div>
|
||||
|
@ -14,8 +14,14 @@
|
|||
<script>
|
||||
import './components/background_video'
|
||||
export default {
|
||||
data(){
|
||||
return {
|
||||
isMap:false
|
||||
}
|
||||
},
|
||||
mounted(){
|
||||
window.app=this;
|
||||
this.isMap=location.hash.indexOf("#/map")>=0;
|
||||
}
|
||||
}
|
||||
</script>
|
|
@ -45,6 +45,21 @@ const todayAttendance=(data)=>{
|
|||
})
|
||||
}
|
||||
|
||||
const workerOnDuty=(data)=>{
|
||||
return request({
|
||||
url:"bgscreen/attendance/workerOnDuty",
|
||||
method:"get",
|
||||
params:data
|
||||
})
|
||||
}
|
||||
|
||||
const groupByWorkerOnDuty=(data)=>{
|
||||
return request({
|
||||
url:"bgscreen/attendance/groupByWorkerOnDuty",
|
||||
method:"get",
|
||||
params:data
|
||||
})
|
||||
}
|
||||
const selectList=(data,pageNum,pageSize)=>{
|
||||
return request({
|
||||
url: `bgscreen/attendance/selectList?pageNum=${pageNum}&pageSize=${pageSize}`,
|
||||
|
@ -59,5 +74,7 @@ export default{
|
|||
todayAttendance,
|
||||
selectList,
|
||||
groupAllByComany,
|
||||
listAttendance
|
||||
listAttendance,
|
||||
workerOnDuty,
|
||||
groupByWorkerOnDuty
|
||||
}
|
|
@ -220,14 +220,18 @@ const covertData = (objs) => {
|
|||
* @param {*} data
|
||||
* @returns
|
||||
*/
|
||||
const countCompletionRate = (data) => {
|
||||
const countCompletionRate = (data,prjs) => {
|
||||
return new Promise((resolve) => {
|
||||
if(!prjs || prjs.length==0){
|
||||
resolve([]);
|
||||
return;
|
||||
}
|
||||
request({
|
||||
url: "bgscreen/projectBuildNode/countCompletionRate",
|
||||
method: "post",
|
||||
data: data,
|
||||
}).then((d) => {
|
||||
let tmps = (d.data || []).map((it) => {
|
||||
}).then((d) => {
|
||||
let tmps = (d.data || []).map((it) => {
|
||||
it.lvl = it.baseBuildNode.nodeLvl;
|
||||
it.projectName = it.project?.projectName || "";
|
||||
it.parentLvl = it.lvl.substring(0, it.lvl.length - 2);
|
||||
|
@ -238,8 +242,17 @@ const countCompletionRate = (data) => {
|
|||
it.percent = (((it.nodeId * 100.0) / it.id) * 1.0).toFixed(2);
|
||||
}
|
||||
return it;
|
||||
}).sort((a,b)=>a.projectId-b.projectId);
|
||||
let retTmps=prjs.filter(it=>it.id>0).map(it=>{
|
||||
let o={...it};
|
||||
let finds=tmps.filter(item=>item.projectId==it.id);
|
||||
if(finds.length>0){
|
||||
o={...it,...finds[0]};
|
||||
}
|
||||
return o;
|
||||
});
|
||||
resolve(tmps);
|
||||
|
||||
resolve(retTmps);
|
||||
});
|
||||
});
|
||||
};
|
||||
|
|
|
@ -1,16 +1,58 @@
|
|||
<template>
|
||||
<MyDialog v-if="show" v-model="show" width="1600px" height="850px" class="job-worker-dialog">
|
||||
<template slot="title">在岗人数({{ cnt}})</template>
|
||||
<el-table :data="tableData" class="mytable" max-height="750" style="width: 100%;background: transparent;" ref="fbsubordinateUnit" :show-summary="tableData.length>1">
|
||||
<el-table-column label="项目名称" align="left" prop="projectName" />
|
||||
<el-table-column label="部门" align="left" prop="deptName" ></el-table-column>
|
||||
<el-table-column label="劳务人数" align="center" prop="servicePersonnel" />
|
||||
<el-table-column label="监理人数" align="center" prop="supervisorPersonnel" />
|
||||
<el-table-column label="总包人数" align="center" prop="contractorPersonnel" />
|
||||
</el-table>
|
||||
|
||||
<el-pagination layout="total,prev, pager, next" :hide-on-single-page="true" @current-change="handleCurrentChange" :total="total" :page-size="size" :current-page.sync="index" class="bg-pagination"></el-pagination>
|
||||
<MyDialog v-if="show" v-model="show" width="1600px" height="850px" class="today-attendance-detail">
|
||||
<template v-if="isGroup">
|
||||
<template slot="title">在岗人数({{ total }})</template>
|
||||
<el-table :data="tableData" class="mytable" max-height="750" style="width: 100%;background: transparent;"
|
||||
ref="fbsubordinateUnit" :show-summary="tableData.length > 1">
|
||||
<el-table-column label="项目名称" align="left" prop="prjName" />
|
||||
<el-table-column label="部门" align="left" prop="dptName"></el-table-column>
|
||||
<el-table-column label="劳务人数" align="center" prop="data101" />
|
||||
<el-table-column label="监理人数" align="center" prop="data102" />
|
||||
<el-table-column label="总包人数" align="center" prop="data103" />
|
||||
<el-table-column label="合计" align="center" prop="total">
|
||||
<template slot-scope="{row}"><span style="font-size:16px;font-weight: bold;color:#87e3fa;">{{row.total }}</span></template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
||||
</template>
|
||||
<template v-else>
|
||||
<template slot="title">在岗人数({{ indexData.total }})</template>
|
||||
<div class="head-title-tab" style="padding: 10px 0px;">
|
||||
<div :class="nav == 101 ? 'head-nav active' : 'head-nav'" @click="doNav(101)">总包人员({{ indexData.data101
|
||||
}})</div>
|
||||
<div :class="nav == 102 ? 'head-nav active' : 'head-nav'" @click="doNav(102)">监理人员({{ indexData.data102
|
||||
}})</div>
|
||||
<div :class="nav == 103 ? 'head-nav active' : 'head-nav'" @click="doNav(103)">劳务人员({{ indexData.data103
|
||||
}})</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">
|
||||
<template slot-scope="{row}">
|
||||
<el-image :src="row.recentPhoto" :preview-src-list="[row.recentPhoto]" style="height:60px" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="姓名" align="center" prop="name" />
|
||||
<el-table-column label="籍贯" align="center" prop="nativePlace" />
|
||||
<el-table-column label="性别" align="center" prop="attendanceType">
|
||||
<template slot-scope="{row}">{{ row.gender == 1 ? '女' : '男' }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="进场时间" align="center" prop="inTime" v-if="1 == 2">
|
||||
<template slot-scope="{row}">{{ row.enterDate | formatDate }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="分包商名称" align="center" prop="companyName">
|
||||
<template slot-scope="{row}">{{row.companyName||row.degreeName}}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="所属班组" align="center" >
|
||||
<template slot-scope="{row}">{{ row.groupName||row.remark }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="岗位/工种" align="center" prop="workTypeName" />
|
||||
</el-table>
|
||||
|
||||
<el-pagination layout="total,prev, pager, next" :hide-on-single-page="true"
|
||||
@current-change="handleCurrentChange" :total="total" :page-size="size" :current-page.sync="index"
|
||||
class="bg-pagination"></el-pagination>
|
||||
</template>
|
||||
</MyDialog>
|
||||
</template>
|
||||
|
||||
|
@ -25,56 +67,127 @@ export default {
|
|||
|
||||
data() {
|
||||
return {
|
||||
loading: false,
|
||||
show: false,
|
||||
tableData: [],
|
||||
projectId:0,
|
||||
deptId:0,
|
||||
size:10,
|
||||
index:1,
|
||||
total:0,
|
||||
nav:1,
|
||||
cnt:0,
|
||||
projectId: 0,
|
||||
deptId: 0,
|
||||
isGroup: false,
|
||||
size: 10,
|
||||
index: 1,
|
||||
total: 0,
|
||||
nav: 101,
|
||||
indexData: {
|
||||
total: 0,
|
||||
data101: 0,
|
||||
data102: 0,
|
||||
data103: 0
|
||||
},
|
||||
};
|
||||
},
|
||||
|
||||
mounted() {
|
||||
|
||||
|
||||
},
|
||||
|
||||
methods: {
|
||||
handleCurrentChange(n){
|
||||
this.index=n;
|
||||
handleCurrentChange(n) {
|
||||
this.index = n;
|
||||
this.loadData();
|
||||
},
|
||||
doNav(n){
|
||||
this.nav=n;
|
||||
this.index=1;
|
||||
doNav(n) {
|
||||
this.nav = n;
|
||||
this.index = 1;
|
||||
this.loadData();
|
||||
},
|
||||
showDialog(data) {
|
||||
this.projectId=data?.projectId||0;
|
||||
this.deptId=data?.deptId||0;
|
||||
this.size=10;
|
||||
this.index=1;
|
||||
this.loadData();
|
||||
const getData = id => {
|
||||
var tmps = data.datas.filter(d => d.text == id);
|
||||
return tmps.length > 0 ? tmps[0].cnt : 0;
|
||||
}
|
||||
this.indexData.total = data.total;
|
||||
this.indexData.data101 = getData("101");
|
||||
this.indexData.data102 = getData("102");
|
||||
this.indexData.data103 = getData("103");
|
||||
this.projectId = data?.projectId || 0;
|
||||
this.deptId = data?.deptId || 0;
|
||||
this.size = 10;
|
||||
this.index = 1;
|
||||
if (this.projectId == 0) {
|
||||
this.isGroup = true;
|
||||
this.loadGroupData();
|
||||
} else {
|
||||
this.isGroup = false;
|
||||
this.loadData();
|
||||
}
|
||||
this.show = true
|
||||
},
|
||||
loadData(){
|
||||
let postData={
|
||||
projectId:this.projectId,
|
||||
deptId:this.deptId,
|
||||
id:this.nav
|
||||
loadGroupData() {
|
||||
this.$api.attendance.groupByWorkerOnDuty({ deptId: this.deptId }).then(d => {
|
||||
const getTypeId = (id) => {
|
||||
let typeId = { "101": [1, 6], "102": [8], "103": [0, 2, 3, 4, 5] }
|
||||
for (let k in typeId) {
|
||||
let v = typeId[k];
|
||||
if (v.indexOf(id) >= 0) {
|
||||
return k;
|
||||
}
|
||||
}
|
||||
return "";
|
||||
}
|
||||
let tmps = (d.data || []).map(it => {
|
||||
return {
|
||||
prjName: it.name,
|
||||
dptName: it.groupName,
|
||||
companyId: getTypeId(+it.companyId),
|
||||
cnt: it.cfgid
|
||||
}
|
||||
});
|
||||
let sum = 0;
|
||||
let obj = {};
|
||||
tmps.forEach(it => {
|
||||
let k = it.prjName + "_" + it.dptName + "_";
|
||||
let o = null;
|
||||
if (!obj[k]) {
|
||||
o = {
|
||||
prjName: it.prjName,
|
||||
dptName: it.dptName,
|
||||
data101: 0,
|
||||
data102: 0,
|
||||
data103: 0,
|
||||
total:0,
|
||||
};
|
||||
obj[k] = o;
|
||||
} else {
|
||||
o = obj[k];
|
||||
}
|
||||
sum += it.cnt;
|
||||
o['data' + it.companyId] += it.cnt;
|
||||
});
|
||||
this.tableData = [];
|
||||
for (let k in obj) {
|
||||
let o=obj[k];
|
||||
o.total=o.data101+o.data102+o.data103;
|
||||
this.tableData.push(o);
|
||||
}
|
||||
this.total = sum;
|
||||
})
|
||||
},
|
||||
loadData() {
|
||||
let postData = {
|
||||
projectId: this.projectId,
|
||||
pageSize: this.size,
|
||||
pageNum: this.index,
|
||||
id: this.nav
|
||||
}
|
||||
this.$api.attendance.selectList(postData,this.index,this.size).then(d=>{
|
||||
let cnt=0;
|
||||
this.total=(d.total||0)
|
||||
this.tableData=(d.rows||[]).map(it=>{
|
||||
cnt+=(it.servicePersonnel||0);
|
||||
cnt+=(it.supervisorPersonnel||0);
|
||||
cnt+=(it.contractorPersonnel||0);
|
||||
this.tableData = [];
|
||||
this.loading = true;
|
||||
this.$api.attendance.workerOnDuty(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;
|
||||
return it;
|
||||
});
|
||||
this.cnt=cnt;
|
||||
this.loading = false;
|
||||
})
|
||||
}
|
||||
},
|
||||
|
@ -82,34 +195,37 @@ export default {
|
|||
</script>
|
||||
|
||||
<style lang="less" scoped>
|
||||
.mytable{
|
||||
/deep/ th .cell{
|
||||
.mytable {
|
||||
/deep/ th .cell {
|
||||
color: aquamarine;
|
||||
}
|
||||
}
|
||||
.job-worker-dialog{
|
||||
/deep/ .quality-table {
|
||||
.el-table__footer-wrapper td{
|
||||
background: transparent;
|
||||
background-image: none !important;
|
||||
border-bottom:solid 1px rgba(60,170,255,0.3);
|
||||
}
|
||||
.el-table .el-table__row{
|
||||
|
||||
.today-attendance-detail {
|
||||
/deep/ .quality-table .el-table .el-table__row {
|
||||
background-image: none !important;
|
||||
td{
|
||||
border-bottom:solid 1px rgba(60,170,255,0.3);
|
||||
|
||||
td {
|
||||
border-bottom: solid 1px rgba(60, 170, 255, 0.3);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
<style lang="less">
|
||||
.job-worker-dialog{
|
||||
.popup-project-introduction-min {
|
||||
.today-attendance-detail {
|
||||
.popup-project-introduction-min {
|
||||
transform: translateY(100px);
|
||||
.bg-pagination{
|
||||
margin-top:20px;
|
||||
|
||||
.bg-pagination {
|
||||
margin-top: 20px;
|
||||
}
|
||||
}
|
||||
|
||||
.head-title-tab {
|
||||
.head-nav {
|
||||
padding: 4px 36px;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
</style>
|
|
@ -1,5 +1,5 @@
|
|||
<template>
|
||||
<MyDialog v-if="show" v-model="show" width="1200px" height="550px" class="projectSpecialDlg">
|
||||
<MyDialog v-if="show" v-model="show" width="1200px" height="600px" class="projectSpecialDlg">
|
||||
<template slot="title">{{title}}</template>
|
||||
<div class="head-title-tab">
|
||||
<div :class="nav == 'all' ? 'head-nav active' : 'head-nav'" @click="doNav('all')">全部数据({{ tags.all }})</div>
|
||||
|
@ -22,7 +22,9 @@
|
|||
<el-table-column label="证书编号" align="center" prop="credentialNumber"></el-table-column>
|
||||
<el-table-column label="证书过期时间" align="center" prop="credentialExpirationTime"></el-table-column>
|
||||
<el-table-column label="证书类型" align="center" prop="credentialType" v-if="false"></el-table-column>
|
||||
<el-table-column label="提交时间" align="center" prop="createTime" width="100"></el-table-column>
|
||||
<el-table-column label="提交时间" align="center" prop="createTime" width="100">
|
||||
<template slot-scope="scope">{{ scope.row.createTime|formatDate }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
|
|
|
@ -41,12 +41,13 @@
|
|||
</el-col>
|
||||
<el-col :span="12">
|
||||
<module-one-2-1 class="center-image" label="集团项目区域分布">
|
||||
<map-index></map-index>
|
||||
<map-index v-if="1==2"></map-index>
|
||||
<iframe src="#/map" style="width:100%;height:100%;border:none"></iframe>
|
||||
</module-one-2-1>
|
||||
<el-row>
|
||||
<el-col :span="12" style="position: relative;">
|
||||
<module-one-1-1 label="人员统计" :key="elDeptWorks">
|
||||
<img src="images/icon2001.png" v-show="infoNav == 1" style="position: absolute;cursor: pointer;right: 20px;top: 12px;"
|
||||
<img src="images/icon2001.png" v-show="laborPersonnelTotal>0" style="position: absolute;cursor: pointer;right: 20px;top: 12px;"
|
||||
@click="doShowAttendanceDetail">
|
||||
<div class="warning-info-title" style="padding-left: 20px;">
|
||||
<div :class="infoNav == 0 ? 'active' : ''" @click="onWarningInfoNav(0)">在岗人数</div>
|
||||
|
@ -219,7 +220,7 @@
|
|||
<index-dlg2 ref="dlg2"></index-dlg2>
|
||||
<index-dlg3 ref="dlg3"></index-dlg3>
|
||||
<journalismDlg ref="journalismDlg"></journalismDlg>
|
||||
<AttendanceDetailDialog ref="attDetailDlg"></AttendanceDetailDialog>
|
||||
<AttendanceDetailDialog ref="attDetailDlg"></AttendanceDetailDialog>
|
||||
<JobWorkerDialog ref="jobWorkerdlg"></JobWorkerDialog>
|
||||
</div>
|
||||
</template>
|
||||
|
@ -532,7 +533,16 @@ export default {
|
|||
if(this.infoNav == 1){
|
||||
this.$refs.attDetailDlg.showDialog(data);
|
||||
}else{
|
||||
this.$refs.jobWorkerdlg.showDialog(data);
|
||||
this.$refs.jobWorkerdlg.showDialog({
|
||||
...data,
|
||||
total:this.laborPersonnelTotal,
|
||||
datas:this.laborPersonnelData.map(it=>{
|
||||
return {
|
||||
text:it.text.replace("总包人员","101").replace("监理人员","102").replace("劳务人员","103"),
|
||||
cnt:it.value
|
||||
}
|
||||
})
|
||||
});
|
||||
}
|
||||
},
|
||||
//查询在岗人数
|
||||
|
@ -546,7 +556,7 @@ export default {
|
|||
if (this.infoNav == 0) {
|
||||
ajax=this.$api.attendance.groupAllByComany
|
||||
}
|
||||
ajax(data).then(d=>{
|
||||
ajax(data).then(d=>{
|
||||
let tmps=d.data||[];
|
||||
const func=(ids)=>{
|
||||
let sum=0;
|
||||
|
|
|
@ -0,0 +1,41 @@
|
|||
<template>
|
||||
<map-index></map-index>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import mapIndex from './index/mapIndex.vue'
|
||||
export default {
|
||||
name: 'JhbigscreenMap',
|
||||
components: {
|
||||
mapIndex
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
|
||||
};
|
||||
},
|
||||
beforeCreate(){
|
||||
document.body.classList.add("is-map");
|
||||
},
|
||||
mounted() {
|
||||
|
||||
},
|
||||
|
||||
methods: {
|
||||
|
||||
},
|
||||
};
|
||||
</script>
|
||||
<style lang="less">
|
||||
body{
|
||||
&.is-map{
|
||||
height:100%;
|
||||
.screen-content-max{
|
||||
height: 100%;
|
||||
}
|
||||
.main-app{
|
||||
height: 100%;
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
|
@ -84,7 +84,7 @@
|
|||
<div :class="infoNav == 1 ? 'active' : ''" @click="onWarningInfoNav(1, '今日出勤')">今日出勤
|
||||
</div>
|
||||
</div>
|
||||
<img src="images/icon2001.png" v-show="infoNav == 1 " style="position: absolute;cursor: pointer;right: 20px;top: 12px;"
|
||||
<img src="images/icon2001.png" v-show="laborPersonnelTotal>0" style="position: absolute;cursor: pointer;right: 20px;top: 12px;"
|
||||
@click="doShowAttendanceDetail">
|
||||
<el-row :key="elDeptWorks">
|
||||
<el-col :span="8">
|
||||
|
@ -781,7 +781,16 @@ export default {
|
|||
if (this.infoNav == 1) {
|
||||
this.$refs.attDetailDlg.showDialog(data);
|
||||
} else {
|
||||
this.$refs.jobWorkerdlg.showDialog(data);
|
||||
this.$refs.jobWorkerdlg.showDialog({
|
||||
...data,
|
||||
total:this.laborPersonnelTotal,
|
||||
datas:this.laborPersonnelData.map(it=>{
|
||||
return {
|
||||
text:it.text.replace("总包人员","101").replace("监理人员","102").replace("劳务人员","103"),
|
||||
cnt:it.value
|
||||
}
|
||||
})
|
||||
});
|
||||
}
|
||||
});
|
||||
},
|
||||
|
@ -927,6 +936,7 @@ export default {
|
|||
this.$refs.mapModle.initImgs(obj?.images || []);
|
||||
}
|
||||
});
|
||||
this.photographyList=[];
|
||||
this.$api.project.selectLastPhotography(id).then(d => {
|
||||
this.photographyList = d.data || [];
|
||||
});
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
<module-one-1-1 :label="label1" style="position: relative;">
|
||||
<img src="images/icon2001.png"
|
||||
style="position: absolute;cursor: pointer;right: 20px;top: 32px;z-index: 9;"
|
||||
@click="doStandardDlg">
|
||||
@click="doStandardDlg(null)">
|
||||
<enginChart ref="chart1" :height="300"></enginChart>
|
||||
</module-one-1-1>
|
||||
<module-one-2-1 label="项目标准化管理排名" style="position: relative;">
|
||||
|
@ -164,7 +164,7 @@ export default {
|
|||
};
|
||||
return obj
|
||||
},
|
||||
doStandardDlg(it){
|
||||
doStandardDlg(it){
|
||||
let obj={
|
||||
deptId: this.dept?.id || 0,
|
||||
projectId: this.project?.id || 0
|
||||
|
|
|
@ -526,12 +526,16 @@ export default {
|
|||
},
|
||||
selectCompletionRate(){
|
||||
let postData = {}
|
||||
let prjs=[];
|
||||
if (this.prjInfo.id == 0) {
|
||||
postData.id = this.dept.id;
|
||||
prjs=this.projects||[];
|
||||
} else {
|
||||
postData.projectId = this.prjInfo.id;
|
||||
}
|
||||
this.$api.buildNode.countCompletionRate(postData).then(d=>{
|
||||
prjs=[this.prjInfo];
|
||||
}
|
||||
|
||||
this.$api.buildNode.countCompletionRate(postData,prjs).then(d=>{
|
||||
this.completionData=d||[];
|
||||
})
|
||||
},
|
||||
|
|
|
@ -183,7 +183,7 @@
|
|||
<svg v-if="it.fileType=='MP4'" style="vertical-align: middle;fill: currentColor;overflow: hidden;" t="1692028772745" class="icon my-svg-icon2" viewBox="0 0 1117 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2072"><path d="M977.454545 0a139.636364 139.636364 0 0 1 139.403637 131.444364L1117.090909 139.636364v744.727272a139.636364 139.636364 0 0 1-131.444364 139.403637L977.454545 1024H139.636364a139.636364 139.636364 0 0 1-139.403637-131.444364L0 884.363636V139.636364A139.636364 139.636364 0 0 1 131.444364 0.232727L139.636364 0h837.818181z m46.545455 302.545455h-122.228364l-7.214545 5.818181-4.608-5.818181h-267.450182l-7.214545 5.818181-4.608-5.818181H343.226182l-7.214546 5.818181L331.403636 302.545455H93.090909V884.363636a46.545455 46.545455 0 0 0 41.099636 46.219637L139.636364 930.909091h837.818181a46.545455 46.545455 0 0 0 46.219637-41.099636L1024 884.363636V302.545455zM484.212364 422.818909l4.654545 2.420364 279.272727 162.909091a46.545455 46.545455 0 0 1 5.12 76.986181l-5.12 3.444364-279.272727 162.909091a46.545455 46.545455 0 0 1-69.678545-34.909091L418.909091 791.272727v-325.818182a46.545455 46.545455 0 0 1 65.303273-42.635636zM512 546.443636v163.793455l140.381091-81.92L512 546.443636zM163.84 93.090909H139.636364a46.545455 46.545455 0 0 0-46.219637 41.099636L93.090909 139.636364v69.818181h163.84l-93.090909-116.363636z m279.272727 0H282.996364l93.090909 116.363636h160.116363l-93.090909-116.363636z m279.272728 0h-160.116364l93.090909 116.363636h160.116364l-93.090909-116.363636zM977.454545 93.090909h-135.912727l93.090909 116.363636H1024V139.636364a46.545455 46.545455 0 0 0-41.099636-46.219637L977.454545 93.090909z" fill="#008df0" p-id="2073"></path></svg>
|
||||
<div style="flex-grow: 1;padding-left: 20px;line-height: 24px;width: 75%;">
|
||||
<div class="file-name">{{ it.fileName }}</div>
|
||||
<div style="color: #aaa;" class="file-time">{{ it.createTime }}</div>
|
||||
<div style="color: #aaa;" class="file-time">{{ it.createTime |formatDate }}</div>
|
||||
<div style="color: #aaa;" class="file-time"><svg style="vertical-align: text-bottom;cursor: pointer;" t="1697992702309" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4259" width="16" height="16"><path d="M512 768c-183.466667 0-328.533333-85.333333-426.666667-256 98.133333-170.666667 243.2-256 426.666667-256s328.533333 85.333333 426.666667 256c-98.133333 170.666667-243.2 256-426.666667 256z m8.533333-426.666667c-128 0-256 55.466667-328.533333 170.666667 72.533333 115.2 200.533333 170.666667 328.533333 170.666667s238.933333-55.466667 311.466667-170.666667c-72.533333-115.2-183.466667-170.666667-311.466667-170.666667z m-8.533333 298.666667c-72.533333 0-128-55.466667-128-128s55.466667-128 128-128 128 55.466667 128 128-55.466667 128-128 128z m0-85.333333c25.6 0 42.666667-17.066667 42.666667-42.666667s-17.066667-42.666667-42.666667-42.666667-42.666667 17.066667-42.666667 42.666667 17.066667 42.666667 42.666667 42.666667z" fill="#01A9FF" p-id="4260"></path></svg> <span style="color:#01A9FF;cursor: pointer;">{{it.readNum}}</span></div>
|
||||
</div>
|
||||
<div>
|
||||
|
@ -351,7 +351,7 @@ export default {
|
|||
// 传达文件路由
|
||||
fileNav: 1,
|
||||
// 传达文件标题
|
||||
fileTitle: "传达文件(0)",
|
||||
fileTitle: "传达文件",
|
||||
// 传达文件列表
|
||||
fileList: [],
|
||||
infoNav: 'sxkj',
|
||||
|
@ -508,7 +508,8 @@ export default {
|
|||
getWorkFileList() {
|
||||
this.$api.workFile.getWorkFileList(this.fileNav,this.fileNav==3?this.dept.id:0).then(d => {
|
||||
this.fileList = d.rows;
|
||||
let _title = "传达文件(" + this.fileList.length + ")";
|
||||
//let _title = "传达文件(" + this.fileList.length + ")";
|
||||
let _title = "传达文件";
|
||||
this.fileTitle = _title;
|
||||
});
|
||||
},
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
<el-table-column label="拟用品牌" align="center" prop="useBrand" width="120" />
|
||||
<el-table-column label="封样时间" align="center" prop="sealDate" >
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.sealDate | formatDateTime }}</span>
|
||||
<span>{{ scope.row.sealDate | formatDate }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="审批状态" align="center" prop="approveStatus" width="120">
|
||||
|
|
|
@ -59,7 +59,7 @@
|
|||
<div class="row-3">
|
||||
<div v-if="it.checkResult == '1'" class="sp-lbl">验收合格</div>
|
||||
<div v-if="it.checkResult == '2'" class="sp-err">验收不合格</div>
|
||||
<div class="sp-date">{{ it.checkingDate }}</div>
|
||||
<div class="sp-date">{{ it.checkingDate|formatDate }}</div>
|
||||
</div>
|
||||
<div class="row-3">
|
||||
<span class="sp-label">项目:</span>
|
||||
|
@ -125,7 +125,7 @@
|
|||
<div class="row-3">
|
||||
<div v-if="it.checkResult == '1'" class="sp-lbl">验收合格</div>
|
||||
<div v-if="it.checkResult == '2'" class="sp-err">验收不合格</div>
|
||||
<div class="sp-date">{{ it.checkingDate }}</div>
|
||||
<div class="sp-date">{{ it.checkingDate |formatDate }}</div>
|
||||
</div>
|
||||
<div class="row-3">
|
||||
<span class="sp-label">项目:</span>
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
<div class="row-3">
|
||||
<div v-if="it.checkResult == '1'" class="sp-lbl">验收合格</div>
|
||||
<div v-if="it.checkResult == '2'" class="sp-err">验收不合格</div>
|
||||
<div class="sp-date">{{ it.checkingDate }}</div>
|
||||
<div class="sp-date">{{ it.checkingDate |formatDate }}</div>
|
||||
</div>
|
||||
<div class="row-3">
|
||||
<span class="sp-label">项目:</span>
|
||||
|
|
|
@ -69,7 +69,7 @@
|
|||
</span>
|
||||
</td>
|
||||
|
||||
<td><img src="images/title_icon.png"><span class="sp-label">办理时间:</span>{{it.createTime|formatDateTime}}</td>
|
||||
<td><img src="images/title_icon.png"><span class="sp-label">办理时间:</span>{{it.createTime|formatDate}}</td>
|
||||
|
||||
</tr>
|
||||
</table>
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
人</span>
|
||||
</div>
|
||||
<div>
|
||||
<span>培训时间:</span><span>{{ it.beginDate }}</span>
|
||||
<span>培训时间:</span><span>{{ it.beginDate|formatDate }}</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
@ -9,6 +9,12 @@ const routes = [
|
|||
name: 'index',
|
||||
meta:{nav:1,},
|
||||
component: () => import(/* webpackChunkName: "index" */ '../pages/index.vue')
|
||||
},
|
||||
{
|
||||
path: '/map',
|
||||
name: 'map',
|
||||
meta:{nav:100,},
|
||||
component: () => import(/* webpackChunkName: "map" */ '../pages/map.vue')
|
||||
},
|
||||
{
|
||||
path: '/detail',
|
||||
|
|
Loading…
Reference in New Issue