mt-fe-group/yudao-init
9
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request 'projects/mescc/zhp' (#110) from projects/mescc/zhp into projects/mescc/develop
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source 
Reviewed-on: #110
This commit is contained in:
朱菊兰
2024-08-01 16:37:45 +08:00
parent 12b37c13c7 a618e081b5
commit ff59f7d955
13 changed files with 45 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/views/copilot/components/CopilotHeader.vue
View File

@@ -7,7 +7,7 @@
<template>
<div class="copilot-header">
<section class="menu">
<section class="menu left">
<CopilotButton v-for="i in ['产量', '效率']" :key="i" :label="i" :active="i === active"
@click="() => $emit('update:active', i)" />
<div class="type-name"></div>
@@ -15,7 +15,7 @@
@click="() => $emit('update:than', i)" />
</section>
<div class="page-title">{{ active }}驾驶舱</div>
<section class="menu" style="width: 24vw;float: right;">
<section class="menu right" style="width: 24vw;float: right;">
<CopilotButton v-for="i in ['日', '周', '月', '年']" :key="i" :label="i" :active="i === period"
@click="() => $emit('update:period', i)" />
<div class="btn-group">
@@ -132,7 +132,13 @@ export default {
justify-content: space-between;
}
.copilot-header > section {
.copilot-header > .left {
width: 26vw;
display: flex;
align-items: center;
gap: 8px;
}
.copilot-header >.right {
width: 26vw;
display: flex;
align-items: center;
@@ -184,7 +190,7 @@ export default {
/* top: 10px; */
}
.page-title {
width: 25vw;
width: 26vw;
font-size: 54px;
line-height: 70px;
letter-spacing: 5px;

6
src/views/copilot/components/button.vue
View File

@@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2024-04-28 13:42:51
* @LastEditTime: 2024-05-31 13:26:32
* @LastEditTime: 2024-07-31 08:52:25
* @LastEditors: zhp
* @Description:
-->
@@ -54,8 +54,8 @@ button {
background: #006acd40;
backdrop-filter: blur(3px);
text-align: center;
padding: 12px;
padding-left: 20px;
padding: 16px 24px 16px 24px;
padding-left: 32px;
color: #fff;
font-size: 18px;
letter-spacing: 10px;

4
src/views/produce/data/index.vue
View File

@@ -1,13 +1,13 @@
<!--
* @Author: zhp
* @Date: 2024-04-15 10:49:13
* @LastEditTime: 2024-07-25 14:15:21
* @LastEditTime: 2024-07-30 10:31:35
* @LastEditors: zhp
* @Description:
-->
<template>
<div style="display: flex; flex-direction: column; min-height: calc(100vh - 200px - 31px)">
<div class="app-container" style="padding: 16px 24px 0; height: auto; flex-grow: 1;">
<div class="app-container" style="padding: 16px 16px 0; height: auto; flex-grow: 1;">
<el-form :model="listQuery" :inline="true" ref="dataForm" class="blueTip">
<el-form-item label="时间维度" prop="type">
<el-select @change="changType" v-model="listQuery.type" size="small" clearable placeholder="请选择">

2
src/views/report/components/bmLineBar.vue
View File

@@ -75,7 +75,7 @@ export default {
: `<span style="display:inline-block;margin-right:4px;border-radius:2px;width:10px;height:10px;background-color:${params[i].color}"></span>`
}` +
`<span style='display:inline-block;width:180px;color:rgba(0,0,0,0.8);font-size:14px;'>${params[i].seriesName}</span>` +
`<span style='color:rgba(0,0,0,0.48);font-size:14px;'>${
`<span style='color:rgba(0,0,0,0.48);width:150px;display:inline-block;font-size:14px;text-align:right'>${
params[i].name === "%"
? (params[i].value ? params[i].value.toFixed(2) : "0.00") +
params[i].name

4
src/views/report/components/produceLineBar.vue
View File

@@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2024-06-19 15:28:34
* @LastEditTime: 2024-07-26 16:43:54
* @LastEditTime: 2024-07-30 10:56:01
* @LastEditors: zhp
* @Description:
-->
@@ -61,7 +61,7 @@ export default {
: `<span style="display:inline-block;margin-right:4px;border-radius:2px;width:10px;height:10px;background-color:${params[i].color}"></span>`
}` +
`<span style='display:inline-block;width:150px;color:rgba(0,0,0,0.8);font-size:14px;'>${params[i].seriesName}</span>` +
`<span style='color:rgba(0,0,0,0.48);font-size:14px;'>${params[i].seriesName === "综合良率"
`<span style='color:rgba(0,0,0,0.48);width:100px;display:inline-block;font-size:14px;text-align:right'>${params[i].seriesName === "综合良率"
? (params[i].value ? params[i].value.toFixed(2) : 0.0) + "%"
: params[i].seriesName === "转化效率"
? (params[i].value ? params[i].value.toFixed(2) : 0.0) + "%"

4
src/views/report/components/produceLineBarTarget.vue
View File

@@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2024-06-20 16:13:36
* @LastEditTime: 2024-07-09 16:15:10
* @LastEditTime: 2024-07-30 16:04:05
* @LastEditors: zhp
* @Description:
-->
@@ -58,7 +58,7 @@ export default {
"<br/>" +
`<span style='display:inline-block;margin-right:4px;width:10px;height:10px;background-color:${params[i].color}'></span>` +
`<span style='display:inline-block;width:150px;color:rgba(0,0,0,0.8);font-size:14px;'>${params[i].seriesName}</span>` +
`<span style='color:rgba(0,0,0,0.48);font-size:14px;'>${params[i].seriesName === "综合良率"
`<span style='color:rgba(0,0,0,0.48);width:auto;display:inline-block;font-size:14px;text-align:right'>${params[i].seriesName === "综合良率"
? (params[i].data.titleValue ? parseFloat(params[i].data.titleValue.toFixed(2)) : 0.0) + "%"
: params[i].seriesName === "转化效率"
? (params[i].data.titleValue ? parseFloat(params[i].data.titleValue.toFixed(2)) : 0.0) + "%"

4
src/views/report/components/produceLineBarYearTarget.vue
View File

@@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2024-06-20 16:13:52
* @LastEditTime: 2024-07-11 16:45:08
* @LastEditTime: 2024-07-30 10:42:10
* @LastEditors: zhp
* @Description:
-->
@@ -57,7 +57,7 @@ export default {
"<br/>" +
`<span style='display:inline-block;margin-right:4px;width:10px;height:10px;background-color:${params[i].color}'></span>` +
`<span style='display:inline-block;width:150px;color:rgba(0,0,0,0.8);font-size:14px;'>${params[i].seriesName}</span>` +
`<span style='color:rgba(0,0,0,0.48);font-size:14px;'>${params[i].seriesName === "综合良率"
`<span style='color:rgba(0,0,0,0.48);width:150px;display:inline-block;font-size:14px;text-align:right'>${params[i].seriesName === "综合良率"
? (params[i].value ? params[i].value.toFixed(2) : 0.0) + "%"
: params[i].seriesName === "转化效率"
? parseFloat(params[i].value.toFixed(2)) + "%"

4
src/views/report/components/produceLineYieldBar.vue
View File

@@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2024-07-09 16:06:13
* @LastEditTime: 2024-07-26 16:57:33
* @LastEditTime: 2024-07-30 10:42:16
* @LastEditors: zhp
* @Description:
-->
@@ -68,7 +68,7 @@ export default {
: `<span style="display:inline-block;margin-right:4px;border-radius:2px;width:10px;height:10px;background-color:${params[i].color}"></span>`
}` +
`<span style='display:inline-block;width:150px;color:rgba(0,0,0,0.8);font-size:14px;'>${params[i].seriesName}</span>` +
`<span style='color:rgba(0,0,0,0.48);font-size:14px;'>${params[i].seriesName === "综合良率"
`<span style='color:rgba(0,0,0,0.48);width:150px;display:inline-block;font-size:14px;text-align:right'>${params[i].seriesName === "综合良率"
? (params[i].value ? params[i].value.toFixed(2) : 0.0) + "%"
: params[i].seriesName === "转化效率"
? (params[i].value ? params[i].value.toFixed(2) : 0.0) + "%"

4
src/views/report/components/produceLineYieldBarTarget.vue
View File

@@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2024-06-21 09:05:14
* @LastEditTime: 2024-07-09 16:15:04
* @LastEditTime: 2024-07-30 10:42:20
* @LastEditors: zhp
* @Description:
-->
@@ -74,7 +74,7 @@ export default {
res +=
`<span style='display:inline-block;margin-right:4px;width:10px;height:10px;background-color:${params[1].color}'></span>` +
`<span style='display:inline-block;width:150px;color:rgba(0,0,0,0.8);font-size:14px;'>${params[1].axisValueLabel}</span>` +
`<span style='color:rgba(0,0,0,0.48);font-size:14px;'>${params[1].name === "综合良率"
`<span style='color:rgba(0,0,0,0.48);width:150px;display:inline-block;font-size:14px;text-align:right'>${params[1].name === "综合良率"
? (params[1].value ? parseFloat(params[1].value.toFixed(2)) : 0.0) + "%"
: params[1].name === "转化效率"
? (params[1].value ? parseFloat(params[1].value.toFixed(2)) : 0.0) + "%"

3
src/views/report/produceConversion.vue
View File

@@ -770,6 +770,7 @@ export default {
<style lang="scss" scoped>
.search {
// height: calc((100px));
background-color: #fff;
@@ -797,7 +798,7 @@ export default {
height: calc((100vh - 170px));
background-color: #fff;
border-radius: 8px;
padding: 4px 16px 16px 16px;
padding: 16px 16px 16px 16px;
}
.blueTip::before {

10
src/views/report/productionSituationMW.vue
View File

@@ -78,8 +78,8 @@
生产情况对比
</div>
</el-row>
<el-row v-if="this.listQuery.type === 2">
<el-col :span="12">
<el-row v-if="this.listQuery.type === 2" type="flex" justify="space-around">
<el-col :span="11">
<!-- <div class="blueTip">
生产情况对比
</div> -->
@@ -89,6 +89,9 @@
<el-col :span="6">
<bm-line-bar-target :type="listQuery.type" :chartHeight="chartHeight" :legendList="legendList"
:chartMsg="chartMsgTarget" :gridLeft="gridLeft" :chartId="'chartTarget'" :chartNum="chartNum" />
</el-col>
<el-col :span="1">
</el-col>
<el-col :span="6">
<!-- <div class="blueTip">
@@ -985,6 +988,7 @@ export default {
</script>
<style lang="scss" scoped>
.search {
// height: calc((100px));
background-color: #fff;
@@ -1013,7 +1017,7 @@ export default {
height: calc((100vh - 170px));
background-color: #fff;
border-radius: 8px;
padding: 4px 16px 16px 16px;
padding: 16px 16px 16px 16px;
}
.blueTip::before {

14
src/views/report/productionSituationTablets.vue
View File

@@ -78,8 +78,8 @@
生产情况对比
</div>
</el-row>
<el-row v-if="this.listQuery.type === 2">
<el-col :span="12">
<el-row v-if="this.listQuery.type === 2" type="flex" justify="space-around">
<el-col :span="11">
<!-- <div class="blueTip">
生产情况对比
</div> -->
@@ -91,6 +91,9 @@
:chartMsg="chartMsgTarget" :gridLeft="gridLeft" ref="dayTargetChart" :chartId=" 'chartTarget'"
:chartNum="chartNum" />
</el-col>
<el-col :span="1">
<!-- <div v-show="false">1111111111111</div> -->
</el-col>
<el-col :span="6">
<!-- <div class="blueTip">
{{ title }}
@@ -108,9 +111,8 @@
:legendList="legendList" :chartMsg="chartMsg" :chartId="'chartDay'" :chartNum="chartNum" />
</el-col>
<el-col :span="6">
<bm-line-bar-target :type="listQuery.type" :chartHeight="chartHeight"
:legendList="legendList" :chartMsg="chartMsgTarget" :gridLeft="gridLeft" :chartId="'chartDayTarget'"
:chartNum="chartNum" />
<bm-line-bar-target :type="listQuery.type" :chartHeight="chartHeight" :legendList="legendList"
:chartMsg="chartMsgTarget" :gridLeft="gridLeft" :chartId="'chartDayTarget'" :chartNum="chartNum" />
</el-col>
<!-- <el-col :span="6">
<div class="blueTip">
@@ -1393,7 +1395,7 @@ export default {
height: calc((100vh - 170px));
background-color: #fff;
border-radius: 8px;
padding: 4px 16px 16px 16px;
padding: 16px 16px 16px 16px;
}
.blueTip::before {

3
src/views/report/productionYield.vue
View File

@@ -846,6 +846,7 @@ export default {
<style lang="scss" scoped>
.search {
// height: calc((100px));
background-color: #fff;
@@ -873,7 +874,7 @@ export default {
height: calc((100vh - 170px));
background-color: #fff;
border-radius: 8px;
padding: 4px 16px 16px 16px;
padding: 16px 16px 16px 16px;
}
.blueTip::before {