Skip to content

H
hg-smart
Commit 29cadc4a by 宋祥
Options

Merge remote-tracking branch 'origin/dev' into dev

parents 933c308e 532b4097
Showing with 347 additions and 25 deletions
src/main/webapp/HG/BI/HGBI002.jsp
...@@ -106,6 +106,7 @@ ...@@ -106,6 +106,7 @@
<script src="${iPlatStaticURL}/iplatui/assets/js/iplat.ui.bootstrap.min.js"></script> <script src="${iPlatStaticURL}/iplatui/assets/js/iplat.ui.bootstrap.min.js"></script>
<script src="${iPlatStaticURL}/iplatui/js/iplat.ui.min.js"></script> <script src="${iPlatStaticURL}/iplatui/js/iplat.ui.min.js"></script>
<script src="${ctx}/common/js/public.js"></script>
<script src="${ctx}/common/js/dayjs.min.js"></script> <script src="${ctx}/common/js/dayjs.min.js"></script>
<script src="${ctx}/common/js/vue-2.6.10.js"></script> <script src="${ctx}/common/js/vue-2.6.10.js"></script>
<script src="${ctx}/common/js/httpVueLoader.js"></script> <script src="${ctx}/common/js/httpVueLoader.js"></script>
...@@ -558,6 +559,49 @@ ...@@ -558,6 +559,49 @@
flex-wrap: wrap; flex-wrap: wrap;
padding-left: 1vw; padding-left: 1vw;
} }
.page-content-main .el-table, .el-table__expanded-cell{
background-color: transparent!important;
}
.page-content-main .el-table__cell .cell{
font-size: 10px;
padding: 0;
}
.page-content-main .el-table tr{
background-color: transparent!important;
}
.page-content-main .el-table--border, .el-table--group{
/*border-color: #4295f7;*/
border-color: transparent!important;
}
.page-content-main .el-table td.el-table__cell, .el-table th.el-table__cell{
background-color: transparent!important;
border-color: transparent!important;
}
.page-content-main .el-table--border .el-table__cell .cell{
padding-left: 0;
}
.page-content-main .el-table th.el-table__cell > .cell {
padding-right: 0;
}
.page-content-main .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf{
color: #ffffff;
border-color: transparent!important;
font-size: 0.8vw;
}
.page-content-main .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf .cell{
font-size: 0.68vw;
}
.page-content-main .el-table--border th.el-table__cell.gutter:last-of-type{
border-color: transparent!important;
}
.page-content-main .el-table--border::after, .el-table--group::after, .el-table::before{
/*background-color: #4295f7!important;*/
background-color: transparent!important;
}
.page-content-main tr{
border-bottom:1px solid #4295f7!important;
}
</style> </style>
</body> </body>
</html> </html>
src/main/webapp/HG/BI/HGBI003.jsp
...@@ -540,7 +540,7 @@ ...@@ -540,7 +540,7 @@
}, },
series: [ series: [
{ {
data: [0, 0, 0, 0, 0, 0, 0], data: [350, 240, 460, 245, 467, 234, 562],
type: 'line', type: 'line',
smooth: true, smooth: true,
itemStyle: { itemStyle: {
...@@ -591,7 +591,7 @@ ...@@ -591,7 +591,7 @@
}, },
series: [ series: [
{ {
data: [24, 24, 24, 24, 24, 24, 24], data: [30, 45, 50, 23, 24, 18, 80],
type: 'line', type: 'line',
smooth: true, smooth: true,
itemStyle: { itemStyle: {
......
src/main/webapp/HG/BI/components/hipi/002/right-manage-cockpit.vue
...@@ -8,21 +8,43 @@ ...@@ -8,21 +8,43 @@
</div> </div>
<div class="page-content-main"> <div class="page-content-main">
<div class="page-title-project"> <!-- <div class="page-title-project">-->
<div v-for="(item,index) in dataList" <!-- <div v-for="(item,index) in dataList"-->
:key="index" class="project-title-font" <!-- :key="index" class="project-title-font"-->
> <!-- >-->
{{ item }} <!-- {{ item }}-->
</div> <!-- </div>-->
</div> <!-- </div>-->
<div v-for="(temp,index) in getByProjCodewtWtList" :key="index" class="page-title-project" <!-- <div v-for="(temp,index) in getByProjCodewtWtList" :key="index" class="page-title-project"-->
style="margin-top: 0.8vh;height: 5vh;border: 1px solid #0097FF ;"> <!-- style="margin-top: 0.8vh;height: 5vh;border: 1px solid #0097FF ;">-->
<div v-for="(item,index) in getByProjCodewtWtArray" <!-- <div v-for="(item,index) in getByProjCodewtWtArray"-->
:key="index" class="project-title-font" style="opacity: 0.5;" <!-- :key="index" class="project-title-font" style="opacity: 0.5;"-->
<!-- >-->
<!-- {{ temp[item] }}-->
<!-- </div>-->
<!-- </div>-->
<el-table
:data="getByProjCodewtWtList"
border
:height="660"
id="tableId1"
:highlight-current-row="true"
style="width: 100%">
<el-table-column
v-for="(colVal,i) in columns"
:prop="colVal.value"
:align="colVal.align"
:label="colVal.label"
> >
{{ temp[item] }} <template slot-scope="scope">
</div> <span class="project-title-font">{{scope.row[colVal.value] | resetData}}</span>
</div> </template>
</el-table-column>
</el-table>
</div> </div>
</div> </div>
...@@ -43,8 +65,47 @@ module.exports = { ...@@ -43,8 +65,47 @@ module.exports = {
getByProjCodewtWtList:[], getByProjCodewtWtList:[],
dataList:['项目名称','计划完成时间','计划产量','实际产量','进度'], dataList:['项目名称','计划完成时间','计划产量','实际产量','进度'],
getByProjCodewtWtArray:['projName','completeDate','totalWeight','finishWeight','schedule'], getByProjCodewtWtArray:['projName','completeDate','totalWeight','finishWeight','schedule'],
columns:[
{
label: '项目名称',
align: 'center',
value: 'projName',
},
{
label: '计划完成时间',
align: 'center',
value: 'completeDate',
},
{
label: '计划产量',
align: 'center',
value: 'totalWeight',
},
{
label: '实际产量',
align: 'center',
value: 'finishWeight',
},
{
label: '进度',
align: 'center',
value: 'schedule',
},
]
}; };
}, },
filters: {
resetData(d) {
if (d === '' || d === undefined) {
return '-'
} else if (d === 0) {
return 0
} else if (typeof d === 'number') {
return d.toFixed(2)
}
return d
}
},
watch:{ watch:{
factory(newVal) { factory(newVal) {
this.getByProjCodewt(); this.getByProjCodewt();
...@@ -64,7 +125,188 @@ module.exports = { ...@@ -64,7 +125,188 @@ module.exports = {
inInfo.set('inqu_status-0-depositDate',this.dataPicker) inInfo.set('inqu_status-0-depositDate',this.dataPicker)
IPLAT.EiCommunicator.send('HGSC007', 'getByProjCodeWt', inInfo, { IPLAT.EiCommunicator.send('HGSC007', 'getByProjCodeWt', inInfo, {
onSuccess: function (res) { onSuccess: function (res) {
_this.getByProjCodewtWtList = res.extAttr.result let list = [
{
projName:'项目名称',
completeDate:'2024-04-20',
totalWeight:'2000',
finishWeight:'2300',
schedule:'120',
},
{
projName:'项目名称',
completeDate:'2024-04-20',
totalWeight:'2000',
finishWeight:'2300',
schedule:'120',
},
{
projName:'项目名称项目名称项目名称',
completeDate:'2024-04-20',
totalWeight:'2000',
finishWeight:'2300',
schedule:'120',
},
{
projName:'项目名称项目名称',
completeDate:'2024-04-20',
totalWeight:'2000',
finishWeight:'2300',
schedule:'120',
},
{
projName:'项目名称项目名称项目名称项目名称',
completeDate:'2024-04-20',
totalWeight:'2000',
finishWeight:'2300',
schedule:'120',
},
{
projName:'项目名称',
completeDate:'2024-04-20',
totalWeight:'2000',
finishWeight:'2300',
schedule:'120',
},
{
projName:'项目名称',
completeDate:'2024-04-20',
totalWeight:'2000',
finishWeight:'2300',
schedule:'120',
},
{
projName:'项目名称项目名称',
completeDate:'2024-04-20',
totalWeight:'2000',
finishWeight:'2300',
schedule:'120',
},
{
projName:'项目名称项目名称项目名称',
completeDate:'2024-04-20',
totalWeight:'2000',
finishWeight:'2300',
schedule:'120',
},
{
projName:'项目名称',
completeDate:'2024-04-20',
totalWeight:'2000',
finishWeight:'2300',
schedule:'120',
},
{
projName:'项目名称项目名称',
completeDate:'2024-04-20',
totalWeight:'2000',
finishWeight:'2300',
schedule:'120',
},
{
projName:'项目名称',
completeDate:'2024-04-20',
totalWeight:'2000',
finishWeight:'2300',
schedule:'120',
},
{
projName:'项目名称项目名称',
completeDate:'2024-04-20',
totalWeight:'2000',
finishWeight:'2300',
schedule:'120',
},
{
projName:'项目名称项目名称项目名称项目名称',
completeDate:'2024-04-20',
totalWeight:'2000',
finishWeight:'2300',
schedule:'120',
},
{
projName:'项目名称',
completeDate:'2024-04-20',
totalWeight:'2000',
finishWeight:'2300',
schedule:'120',
},
{
projName:'项目名称',
completeDate:'2024-04-20',
totalWeight:'2000',
finishWeight:'2300',
schedule:'120',
},
{
projName:'项目名称项目名称项目名称项目名称项目名称',
completeDate:'2024-04-20',
totalWeight:'2000',
finishWeight:'2300',
schedule:'120',
},
{
projName:'项目名称',
completeDate:'2024-04-20',
totalWeight:'2000',
finishWeight:'2300',
schedule:'120',
},
{
projName:'项目名称',
completeDate:'2024-04-20',
totalWeight:'2000',
finishWeight:'2300',
schedule:'120',
},
{
projName:'项目名称',
completeDate:'2024-04-20',
totalWeight:'2000',
finishWeight:'2300',
schedule:'120',
},
{
projName:'项目名称',
completeDate:'2024-04-20',
totalWeight:'2000',
finishWeight:'2300',
schedule:'120',
},
{
projName:'项目名称',
completeDate:'2024-04-20',
totalWeight:'2000',
finishWeight:'2300',
schedule:'120',
},
{
projName:'项目名称',
completeDate:'2024-04-20',
totalWeight:'2000',
finishWeight:'2300',
schedule:'120',
},
{
projName:'项目名称',
completeDate:'2024-04-20',
totalWeight:'2000',
finishWeight:'2300',
schedule:'120',
},
{
projName:'项目名称',
completeDate:'2024-04-20',
totalWeight:'2000',
finishWeight:'2300',
schedule:'120',
}
]
_this.getByProjCodewtWtList = res.extAttr.result&& res.extAttr.result.length? res.extAttr.result: list;
_this.$nextTick(() => {
tableContentScroll('tableId1')
})
}, },
onFail: function (err) { onFail: function (err) {
...@@ -148,15 +390,9 @@ module.exports = { ...@@ -148,15 +390,9 @@ module.exports = {
display: flex; display: flex;
} }
.project-title-font{ .project-title-font{
width: 25%; color: #f4f4f4;
height: 100%;
display: flex;
font-size: 0.7vw;
justify-content: center;
align-items: center;
color: #fff;
overflow: hidden; overflow: hidden;
flex-wrap: wrap; flex-wrap: wrap;
font-size: 0.65vw;
} }
</style> </style>
src/main/webapp/common/js/public.js 0 → 100644
let timer1 = {}
const tableContentScroll = (el) => {
if (timer1[el]) {
clearInterval(timer1[el])
timer1[el] = null;
}
setTimeout(()=>{
let i = $("#" + el + ' .el-table__body-wrapper table');
let i2 = $("#" + el + ' .el-table__body-wrapper');
let a = 0;
let boxHeight = i.height();
let height = i2.height();
let num = boxHeight - height;
// console.log(boxHeight, height, num,"高度数据")
let run = () => {
if (num > 0) {
timer1[el] = setInterval(() => {
a = a + 0.07;
if (a >= num) {
a = 0
}
i2.scrollTop(a);
}, 10)
}
}
run()
i.on('mouseenter', () => {
clearInterval(timer1[el])
timer1[el] = null
i2.on('scroll',()=>{
a = i2.scrollTop();
})
})
i.on("mouseleave",()=>{
i2.off("scroll");
if(!timer1[el]){
run()
}
})
},50)
}
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