update code
parent
2d5cd870fc
commit
115c9dfaa8
|
@ -46,6 +46,15 @@
|
|||
|
||||
<style type="text/css">
|
||||
#webpack-dev-server-client-overlay{display: none;}
|
||||
.link-prod{
|
||||
text-decoration: none;
|
||||
color: #409EFF;
|
||||
font-weight: bold;
|
||||
font-size: 24px;
|
||||
}
|
||||
.link-prod:visited{
|
||||
color: #409EFF;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
|
@ -54,5 +63,25 @@
|
|||
</noscript>
|
||||
<div id="app"></div>
|
||||
<!-- built files will be auto injected -->
|
||||
<div class="is-test" style="display:none;position: fixed;
|
||||
border: solid 10px red;
|
||||
width: calc(100% - 20px);
|
||||
height: 100%;
|
||||
top: 0px;
|
||||
left: 0px;" id="divTest">
|
||||
<div style="font-size: 40px;
|
||||
position: absolute;
|
||||
right: 10px;
|
||||
color: red;
|
||||
">这是测试环境</div>
|
||||
<div><a class="link-prod" style="position: absolute;top:50px;font-size: 40px;right:10px;" href="https://szgc.jhncidg.com/">访问生产环境</a></div>
|
||||
</div>
|
||||
<script>
|
||||
setTimeout(()=>{
|
||||
if(location.href.indexOf("szgc.jhncidg.com")==-1 && location.href.indexOf("localhost")==-1){
|
||||
document.getElementById("divTest").style.display="block";
|
||||
}
|
||||
},400);
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
@ -108,7 +108,8 @@ const committeeSumGroupByType=(data)=>{
|
|||
let tmps=d.data||[];
|
||||
let sum=0;
|
||||
tmps.forEach(it=>{
|
||||
sum+=it.id||0;
|
||||
sum+=(it.id||0)/10000.0;
|
||||
it.id=(it.id||0)/10000.0;
|
||||
})
|
||||
resolve({
|
||||
total:sum,
|
||||
|
|
|
@ -33,12 +33,7 @@
|
|||
</el-col>
|
||||
<el-col :span="12">
|
||||
<module-one-3-1 label="付款金额" style="position: relative;" class="cost-sum">
|
||||
<div style="position: absolute;right:0px;top:4px;" v-if="1==2">
|
||||
<el-date-picker class="bg-date-picker" v-model="selDate" type="daterange"
|
||||
popper-class="bg-date-picker-pop" :editable="false" @change="dtChange"
|
||||
:picker-options="pickerOptions" range-separator="至" start-placeholder="开始日期"
|
||||
end-placeholder="结束日期"></el-date-picker>
|
||||
</div>
|
||||
|
||||
<el-row style="padding:0px 10px;">
|
||||
<el-col :span="12">
|
||||
<div class="warning-info-title">
|
||||
|
@ -106,10 +101,16 @@
|
|||
|
||||
</el-col>
|
||||
</el-row>
|
||||
<div style="padding:0px 10px;height: calc(100% - 440px);">
|
||||
<div style="padding:0px 10px;height: calc(100% - 440px);position: relative;">
|
||||
<div class="warning-info-title" style="border-bottom: dotted 1px #409effb8;">
|
||||
<div class="active">付款明细</div>
|
||||
</div>
|
||||
<div style="position: absolute;right:0px;top:4px;" v-if="1==1">
|
||||
<el-date-picker class="bg-date-picker" v-model="selDate" type="daterange"
|
||||
popper-class="bg-date-picker-pop" :editable="false" @change="dtChange"
|
||||
:picker-options="pickerOptions" range-separator="至" start-placeholder="开始日期"
|
||||
end-placeholder="结束日期"></el-date-picker>
|
||||
</div>
|
||||
<div class="scroll" v-if="sumList" style="max-height: calc(100% - 50px);overflow-y: auto;">
|
||||
<template v-if="sumList.names.length > 0">
|
||||
<div class="sum-list-item" v-for="(it, idx) in sumList.names" :key="idx">
|
||||
|
@ -173,8 +174,9 @@
|
|||
</div>
|
||||
</template>
|
||||
<template v-else>
|
||||
<div>
|
||||
暂无数据
|
||||
<div style="width:100%;text-align: center;padding-top:200px">
|
||||
<img src="images/nodata.png" style="width: 120px;">
|
||||
<div style="text-align: center;font-size: 12px;color:#888;">暂无数据</div>
|
||||
</div>
|
||||
</template>
|
||||
</div>
|
||||
|
@ -292,6 +294,9 @@ export default {
|
|||
},
|
||||
|
||||
mounted() {
|
||||
let dt1 = this.$dt((+new Date()) - 30 * 24 * 3600 * 1000);
|
||||
let dt2 = this.$dt(new Date());
|
||||
this.selDate = [dt1, dt2];
|
||||
this.$bus.$on("projectChange", debounce(res => {
|
||||
this.project = res;
|
||||
this.dept = this.$root.dept ||this.dept|| {};
|
||||
|
@ -305,7 +310,7 @@ export default {
|
|||
|
||||
methods: {
|
||||
dtChange(init) {
|
||||
this.loadSumCost();
|
||||
//this.loadSumCost();
|
||||
this.loadCostList();
|
||||
},
|
||||
doStateDlg(it) {
|
||||
|
@ -485,13 +490,13 @@ export default {
|
|||
} else {
|
||||
postData.id = this.dept.id;
|
||||
}
|
||||
/*
|
||||
|
||||
if (this.selDate.length > 0) {
|
||||
postData.createTime = +this.$dt(this.selDate[0]).$d;
|
||||
}
|
||||
if (this.selDate.length > 1) {
|
||||
postData.updateTime = +this.$dt(this.selDate[1]).$d;
|
||||
}*/
|
||||
}
|
||||
this.$api.costOut.selectForBigEnginList(postData).then(d => {
|
||||
this.sumList = d;
|
||||
});
|
||||
|
|
|
@ -145,11 +145,11 @@
|
|||
</div>
|
||||
|
||||
|
||||
<div class="analyse_title_blue analyse-title" style="margin-left: 12px;">
|
||||
<div class="analyse_title_blue analyse-title" style="margin-left: 12px;position:relative;">
|
||||
<div>
|
||||
<svg class="icon-money" style="width: 1em;height: 1em;vertical-align: middle;fill: currentColor;overflow: hidden;" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="27211"><path d="M703.146667 977.92H34.133333V728.746667h122.88c20.48-20.48 80.213333-75.093333 143.36-88.746667H614.4c39.253333 0 69.973333 32.426667 69.973333 69.973333 0 39.253333-32.426667 69.973333-69.973333 69.973334h-131.413333c-1.706667 0-3.413333 1.706667-3.413334 3.413333s0 1.706667 1.706667 3.413333c0 0 1.706667 1.706667 3.413333 1.706667h221.866667l167.253333-136.533333c30.72-25.6 75.093333-20.48 100.693334 10.24 11.946667 15.36 17.066667 34.133333 15.36 52.906666-1.706667 18.773333-10.24 35.84-25.6 47.786667L703.146667 977.92zM85.333333 926.72h599.04l245.76-203.093333c3.413333-3.413333 6.826667-8.533333 6.826667-13.653334 0-5.12-1.706667-10.24-5.12-15.36-6.826667-8.533333-20.48-10.24-29.013333-1.706666l-182.613334 148.48h-238.933333c-15.36 0-29.013333-5.12-39.253333-15.36-10.24-10.24-17.066667-23.893333-17.066667-39.253334 0-30.72 25.6-54.613333 54.613333-54.613333H614.4c10.24 0 18.773333-8.533333 18.773333-18.773333s-8.533333-18.773333-18.773333-18.773334H310.613333c-51.2 13.653333-105.813333 63.146667-122.88 81.92l-6.826666 8.533334H85.333333v141.653333zM512 314.026667c-6.826667 0-15.36-3.413333-20.48-8.533334L426.666667 226.986667c-8.533333-10.24-6.826667-27.306667 3.413333-35.84s27.306667-6.826667 35.84 3.413333l46.08 54.613333 46.08-54.613333c8.533333-10.24 25.6-11.946667 35.84-3.413333 10.24 8.533333 11.946667 25.6 3.413333 35.84l-66.56 78.506666c-3.413333 6.826667-11.946667 8.533333-18.773333 8.533334zM590.506667 394.24h-158.72c-13.653333 0-25.6-11.946667-25.6-25.6s11.946667-25.6 25.6-25.6h158.72c13.653333 0 25.6 11.946667 25.6 25.6s-10.24 25.6-25.6 25.6z" ></path><path d="M590.506667 314.026667h-158.72c-13.653333 0-25.6-11.946667-25.6-25.6s11.946667-25.6 25.6-25.6h158.72c13.653333 0 25.6 11.946667 25.6 25.6s-10.24 25.6-25.6 25.6z" ></path><path d="M512 472.746667c-13.653333 0-25.6-11.946667-25.6-25.6v-158.72c0-13.653333 11.946667-25.6 25.6-25.6s25.6 11.946667 25.6 25.6v158.72c0 13.653333-11.946667 25.6-25.6 25.6z"></path><path d="M512 576.853333c-136.533333 0-247.466667-110.933333-247.466667-247.466666S375.466667 81.92 512 81.92s247.466667 110.933333 247.466667 247.466667S648.533333 576.853333 512 576.853333z m0-443.733333c-107.52 0-196.266667 88.746667-196.266667 196.266667S404.48 525.653333 512 525.653333s196.266667-88.746667 196.266667-196.266666S619.52 133.12 512 133.12z"></path></svg>
|
||||
<span style="display:inline-block;margin-left:12px;">付款明细</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div style="height: calc(100% - 410px);">
|
||||
<div class="warning-info-title" style="padding-left: 8px;font-size:14px;">
|
||||
|
@ -224,10 +224,11 @@ export default {
|
|||
workTypeList:[],
|
||||
selType:'',
|
||||
commDetailList:[],
|
||||
|
||||
};
|
||||
},
|
||||
|
||||
mounted() {
|
||||
mounted() {
|
||||
this.$bus.$on("projectChange", debounce(res => {
|
||||
this.project = res;
|
||||
this.prjs=this.$root.projects ||this.prjs||[];
|
||||
|
|
|
@ -177,7 +177,7 @@
|
|||
</module-one-1-2>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<module-one-1-2 label="项目推进会纪要">
|
||||
<module-one-1-2 label="项目问题推进情况">
|
||||
<problemProgress :scheduleInfo="scheduleInfo" :prjInfo="prjInfo"></problemProgress>
|
||||
</module-one-1-2>
|
||||
</el-col>
|
||||
|
|
Loading…
Reference in New Issue