jiangyq
/
YZProjectCloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: jiangyq:a3d2ab897bd063b5882fb864d5a7177413e2e33b
Branches Tags
jiangyq:dev_xd
jiangyq:main
..
compare: jiangyq:7d67e0f2efa4f1bd729e16355b95de9765fa2919
Branches Tags
jiangyq:dev_xd
jiangyq:main

No commits in common. "a3d2ab897bd063b5882fb864d5a7177413e2e33b" and "7d67e0f2efa4f1bd729e16355b95de9765fa2919" have entirely different histories.
a3d2ab897b ... 7d67e0f2ef

4 changed files with 33 additions and 180 deletions
Show Stats Expand all files Collapse all files

34
yanzhu-bigscreen/src/components/manyBarChart.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<div style="height: 100%;" ref="chart"> </div> <div :style="{ 'height': height + 'px' }" ref="chart"> </div>
</template> </template>
<script> <script>
@ -11,6 +11,9 @@ export default {
}, },
yaxis: { yaxis: {
type: Boolean type: Boolean
},
height: {
type: Number
} }
}, },
data() { data() {
@ -43,8 +46,7 @@ export default {
if (objs.unit) { if (objs.unit) {
unit = '单位：' + objs.unit unit = '单位：' + objs.unit
} }
let is1K = this.$dpi() == "1K";
let is2K = this.$dpi() == "2K";
var yAxis = [] var yAxis = []
var grid = '' var grid = ''
if (state == true) { if (state == true) {
@ -53,27 +55,26 @@ export default {
name: unit, name: unit,
nameTextStyle: { //Y轴那么的样式 nameTextStyle: { //Y轴那么的样式
color: '#42d0ff', color: '#42d0ff',
fontSize: is1K ? 14 : is2K ? 16 : 24, fontSize: 14,
}, },
max: objs.max, max: objs.max,
type: "value", type: "value",
axisLabel: { axisLabel: {
textStyle: { textStyle: {
color: "#cbdaff", color: "#cbdaff",
fontSize: is1K ? 14 : is2K ? 14 : 20,
}, },
formatter: "{value}", formatter: "{value}",
}, },
splitLine: { splitLine: {
lineStyle: { lineStyle: {
type: "dashed", type: "dashed",
color: "#2f4472" color: "#2f4472",
}, },
}, },
axisLine: { axisLine: {
show: true, show: true,
lineStyle: { lineStyle: {
color: "#2f4472" color: "#2f4472",
}, },
}, },
} }
@ -89,7 +90,7 @@ export default {
{ {
nameTextStyle: { //Y轴那么的样式 nameTextStyle: { //Y轴那么的样式
color: '#42d0ff', color: '#42d0ff',
fontSize: is1K ? 14 : is2K ? 14 : 20, fontSize: 14,
}, },
max: objs.max, max: objs.max,
type: "value", type: "value",
@ -119,14 +120,10 @@ export default {
this.option = { this.option = {
tooltip: { tooltip: {
trigger: "axis", trigger: "axis",
textStyle: {
fontSize: is1K ? 14 : is2K ? 14 : 20,
},
axisPointer: { axisPointer: {
type: "shadow", type: "shadow",
label: { label: {
show: true, show: true,
fontSize: is1K ? 14 : is2K ? 14 : 20,
}, },
}, },
}, },
@ -148,7 +145,7 @@ export default {
show: true, show: true,
textStyle: { textStyle: {
color: "#cbdaff", //X轴文字颜色 color: "#cbdaff", //X轴文字颜色
fontSize: is1K ? 14 : is2K ? 14 : 22, fontSize: 14,
}, },
interval: 0, interval: 0,
@ -159,14 +156,13 @@ export default {
{ {
name: objs.legend[0], name: objs.legend[0],
type: "bar", type: "bar",
barWidth: is1K ? 10 : is2K ? 10 : 14, barWidth: 10,
barGap: 2, barGap: 2,
label: { label: {
normal: { normal: {
show: true, show: true,
position: "top", position: "top",
color: "#fff", color: "#fff"
fontSize: is1K ? 14 : is2K ? 14 : 20,
}, },
}, },
itemStyle: { itemStyle: {
@ -188,15 +184,13 @@ export default {
{ {
name: objs.legend[1], name: objs.legend[1],
type: "bar", type: "bar",
barWidth: is1K ? 10 : is2K ? 10 : 14, barWidth: 10,
barGap: 2, barGap: 2,
label: { label: {
normal: { normal: {
show: true, show: true,
position: "inside", position: "inside",
color: "#fff", color: "#fff"
fontSize: is1K ? 14 : is2K ? 14 : 18,
}, },
}, },
itemStyle: { itemStyle: {

17
yanzhu-bigscreen/src/views/machmater/components/appFormDialog.vue
View File

@ -1,4 +1,3 @@
}
<template> <template>
<MyDialog v-if="show" v-model="show" width="60vw" height="65vh" class="app-form-dlg"> <MyDialog v-if="show" v-model="show" width="60vw" height="65vh" class="app-form-dlg">
<template slot="title"> <template slot="title">
@ -55,7 +54,7 @@
</el-table> </el-table>
</div> </div>
<div class="xhz-quality-table"> <div class="xhz-quality-table">
<el-table :data="concretePersonTableDataCarList.data" style="width: 100%" :max-height="table1Height"> <el-table :data="concretePersonTableDataCarList.data" style="width: 100%" max-height="136">
<el-table-column v-for="(item, idx) in concretePersonTableDataCarList.label" :key="idx" <el-table-column v-for="(item, idx) in concretePersonTableDataCarList.label" :key="idx"
:width="item.width" :label="item.label"> :width="item.width" :label="item.label">
<template slot-scope="scope"> <template slot-scope="scope">
@ -230,8 +229,8 @@ export default {
resize() { resize() {
let is1K = this.$dpi() == "1K"; let is1K = this.$dpi() == "1K";
let is2K = this.$dpi() == "2K"; let is2K = this.$dpi() == "2K";
this.table1Height = is1K ? 181 : (is2K ? 181 : 188); this.table1Height = is1K ? 181 : (is2K ? 181 : 181);
this.table2Height = is1K ? 136 : (is2K ? 226 : 470); this.table2Height = is1K ? 136 : (is2K ? 226 : 442);
}, },
loadData() { loadData() {
this.applyOrder = { this.applyOrder = {
@ -369,7 +368,7 @@ export default {
.popup-project-introduction-details { .popup-project-introduction-details {
* { * {
font-size: 32px; font-size: 32px;
line-height: 90px; line-height: 60px;
} }
.popup-xhz-title { .popup-xhz-title {
@ -378,14 +377,6 @@ export default {
} }
} }
.el-table__row {
.cell {
height: 90px;
}
}
.el-table__empty-text{
height: 90px;
}
} }
} }
} }

36
yanzhu-bigscreen/src/views/machmater/components/manyChart.vue
View File

@ -1,8 +1,9 @@
<template> <template>
<div class="many-chart-max" ref="process" @mouseover="MouseEnter" @mouseout="MouseLeave" :key="chartWidht"> <div class="many-chart-max" ref="process" @mouseover="MouseEnter" @mouseout="MouseLeave" :key="chartWidht">
<div class="many-chart-min" :style="{ 'width': dataList.length * chartWidht + 'px' }"> <div class="many-chart-min" :style="{ 'width': (dataList.length * chartWidht) + 'px' }">
<div v-for="(item, i) in forData" :key="i" :style="{ 'width': chartWidht + 'px' }" class="many-chart-item"> <div v-for="(item, i) in forData" :key="i" :style="{ 'width': chartWidht + 'px' }">
<material-many-bar-chart :yaxis="i == 0 ? true : false" :dataList="item"></material-many-bar-chart> <material-many-bar-chart :yaxis="i == 0 ? true : false" :height="200"
:dataList="item"></material-many-bar-chart>
<div class="many-chart-text" style="text-align: center ">{{ item.text }}</div> <div class="many-chart-text" style="text-align: center ">{{ item.text }}</div>
</div> </div>
</div> </div>
@ -39,12 +40,10 @@ export default {
setTimeout(() => { setTimeout(() => {
let is1K = this.$dpi() == "1K"; let is1K = this.$dpi() == "1K";
let is2K = this.$dpi() == "2K"; let is2K = this.$dpi() == "2K";
this.count = is1K ? 4 : is2K ? 4 : 4; this.count = is1K ? 4 : is2K ? 6 : 8;
let width = this.$el.clientWidth let width = this.$el.clientWidth
this.chartWidht = width / this.count; this.chartWidht = width / this.count;
console.log("chartWidth:", this.chartWidht,width,this.count)
}, 800); }, 800);
}, },
methods: { methods: {
@ -97,33 +96,10 @@ export default {
</script> </script>
<style lang="less"> <style lang="less">
.many-chart-max { .many-chart-max {
width: 100% !important;
height: 100%;
.many-chart-text { .many-chart-text {
font-size: 18px; font-size: 18px;
position: relative; position: relative;
top: -4px;
} }
.many-chart-min {
height: 100%;
}
@media (min-width: 1921px) and (max-width: 2560px) {
.many-chart-item {
height: calc(100% - 40px);
}
}
@media (min-width: 2561px) {
.many-chart-item {
height: calc(100% - 50px);
}
.many-chart-text {
font-size: 32px;
}
}
} }
</style> </style>

122
yanzhu-bigscreen/src/views/machmater/materialManage.vue
View File

@ -216,11 +216,11 @@ export default {
this.chartKey++; this.chartKey++;
this.orderDataKey++; this.orderDataKey++;
this.workerOrderKey++; this.workerOrderKey++;
this.excessNameWidth = is1K ? 250 : is2K ? 400 : 650; this.excessNameWidth = is1K ? 250 : is2K ? 150 : 650;
this.excessRateDataKey++; this.excessRateDataKey++;
this.excessReasonKey++; this.excessReasonKey++;
this.chart3Height = is1K ? 250 : is2K ? 400 : 600; this.chart3Height = is1K ? 250 : is2K ? 400 : 600;
this.erHeight = is1K ? 80 : is2K ? 100 : 150; this.erHeight = is1K ? 20 : is2K ? 30 : 150;
}, },
init() { init() {
@ -415,7 +415,6 @@ export default {
this.workerOrderLoading = true this.workerOrderLoading = true
let result = await this.$api.machMater.materGetConcreteMaterialActQuantityBuildingNoInfoService(postData) let result = await this.$api.machMater.materGetConcreteMaterialActQuantityBuildingNoInfoService(postData)
result = result.data; result = result.data;
this.workerOrderLoading = false
if (result && result.code == '000000' && result.data) { if (result && result.code == '000000' && result.data) {
let moreDataTemp = [] let moreDataTemp = []
result.data.forEach(item => { result.data.forEach(item => {
@ -465,7 +464,7 @@ export default {
} else { } else {
this.moreData = [] this.moreData = []
} }
this.workerOrderLoading = false
this.workerOrderKey++; this.workerOrderKey++;
}, },
@ -483,7 +482,6 @@ export default {
this.workerOrderLoading = true this.workerOrderLoading = true
let result = await this.$api.machMater.materGetConcreteMaterialActQuantityFloorLevelInfoService(postData); let result = await this.$api.machMater.materGetConcreteMaterialActQuantityFloorLevelInfoService(postData);
result = result.data; result = result.data;
this.workerOrderLoading = false
if (result && result.code == '000000' && result.data) { if (result && result.code == '000000' && result.data) {
let moreDataTemp = [] let moreDataTemp = []
result.data.forEach(item => { result.data.forEach(item => {
@ -522,7 +520,7 @@ export default {
}) })
}) })
this.moreData = moreDataTemp.sort((prev, next) => prev.time - next.time) this.moreData = moreDataTemp.sort((prev, next) => prev.time - next.time)
this.workerOrderLoading = false
this.workerOrderKey++; this.workerOrderKey++;
} }
@ -899,36 +897,6 @@ export default {
} }
@media (min-width: 1921px) and (max-width: 2560px) { @media (min-width: 1921px) and (max-width: 2560px) {
.screen-module {
&.h33 {
height: calc(33% - 7px);
}
}
.concrete-module {
.xhz-concrete-nav {
margin-top: 0px;
}
.xhz-concrete-chart {
height: calc(100% - 40px);
margin-top: 0px;
.no-data {
.no-data-img {
width: 150px;
}
.no-data-text {
font-size: 16px;
}
}
}
}
.xhz-device-data { .xhz-device-data {
.xhz-device-data-min { .xhz-device-data-min {
.survey_content { .survey_content {
@ -938,9 +906,9 @@ export default {
background-size: 90px 70px; background-size: 90px 70px;
img { img {
width: 40px; width: 50px;
height: 40px; height: 50px;
margin-top: 35px margin-top: 25px
} }
} }
} }
@ -1001,82 +969,6 @@ export default {
} }
@media (min-width: 2561px) { @media (min-width: 2561px) {
.screen-module {
&.h33 {
height: calc(33% + 1px);
}
}
.concrete-module {
.xhz-concrete-nav {
margin-top: 0px;
.sjk-chart-line-title {
div {
font-size: 30px;
padding: 10px 20px;
}
}
.xhz-concrete-legend {
font-size: 28px;
button {
width: 40px;
height: 30px;
}
}
.sjk-chart-line-title-tz {
button {
font-size: 30px;
padding: 10px 20px;
}
.more-btn {
font-size: 30px;
padding: 10px 20px;
}
.header-btn-list {
top: 40px;
.header-btn-list-item {
width: 1030px !important;
.header-btn-list-padding {
button {
width: 315px !important;
height: 60px;
line-height: 60px;
}
}
}
}
}
}
.xhz-concrete-chart {
height: calc(100% - 120px);
margin-top: 30px;
.no-data {
.no-data-img {
width: 240px;
}
.no-data-text {
font-size: 24px;
}
}
}
}
.xhz-device-data { .xhz-device-data {
.xhz-device-data-min { .xhz-device-data-min {
.survey_content { .survey_content {