禅道bug修改
This commit is contained in:
parent
2d350eaf78
commit
3d962b17d3
|
|
@ -10,7 +10,8 @@ body {
|
||||||
-moz-osx-font-smoothing: grayscale;
|
-moz-osx-font-smoothing: grayscale;
|
||||||
-webkit-font-smoothing: antialiased;
|
-webkit-font-smoothing: antialiased;
|
||||||
text-rendering: optimizeLegibility;
|
text-rendering: optimizeLegibility;
|
||||||
font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
|
font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB,
|
||||||
|
Microsoft YaHei, Arial, sans-serif;
|
||||||
}
|
}
|
||||||
|
|
||||||
label {
|
label {
|
||||||
|
|
@ -90,7 +91,7 @@ div:focus {
|
||||||
visibility: hidden;
|
visibility: hidden;
|
||||||
display: block;
|
display: block;
|
||||||
font-size: 0;
|
font-size: 0;
|
||||||
content: " ";
|
content: ' ';
|
||||||
clear: both;
|
clear: both;
|
||||||
height: 0;
|
height: 0;
|
||||||
}
|
}
|
||||||
|
|
@ -104,7 +105,9 @@ aside {
|
||||||
display: block;
|
display: block;
|
||||||
line-height: 32px;
|
line-height: 32px;
|
||||||
font-size: 16px;
|
font-size: 16px;
|
||||||
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
|
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen,
|
||||||
|
Ubuntu, Cantarell, 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
|
||||||
|
sans-serif;
|
||||||
color: #2c3e50;
|
color: #2c3e50;
|
||||||
-webkit-font-smoothing: antialiased;
|
-webkit-font-smoothing: antialiased;
|
||||||
-moz-osx-font-smoothing: grayscale;
|
-moz-osx-font-smoothing: grayscale;
|
||||||
|
|
@ -139,7 +142,7 @@ aside {
|
||||||
}
|
}
|
||||||
|
|
||||||
.text-center {
|
.text-center {
|
||||||
text-align: center
|
text-align: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
.sub-navbar {
|
.sub-navbar {
|
||||||
|
|
@ -150,7 +153,13 @@ aside {
|
||||||
text-align: right;
|
text-align: right;
|
||||||
padding-right: 20px;
|
padding-right: 20px;
|
||||||
transition: 600ms ease position;
|
transition: 600ms ease position;
|
||||||
background: linear-gradient(90deg, rgba(32, 182, 249, 1) 0%, rgba(32, 182, 249, 1) 0%, rgba(33, 120, 241, 1) 100%, rgba(33, 120, 241, 1) 100%);
|
background: linear-gradient(
|
||||||
|
90deg,
|
||||||
|
rgba(32, 182, 249, 1) 0%,
|
||||||
|
rgba(32, 182, 249, 1) 0%,
|
||||||
|
rgba(33, 120, 241, 1) 100%,
|
||||||
|
rgba(33, 120, 241, 1) 100%
|
||||||
|
);
|
||||||
|
|
||||||
.subtitle {
|
.subtitle {
|
||||||
font-size: 20px;
|
font-size: 20px;
|
||||||
|
|
@ -205,7 +214,7 @@ aside {
|
||||||
}
|
}
|
||||||
|
|
||||||
.cursor-blue {
|
.cursor-blue {
|
||||||
color: #409EFF;
|
color: #409eff;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -229,3 +238,9 @@ aside {
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.contract-img-item-box {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: repeat(4, 1fr);
|
||||||
|
gap: 10px;
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -78,12 +78,26 @@
|
||||||
@closeDialogOuter="handleCloseDialogOuter"
|
@closeDialogOuter="handleCloseDialogOuter"
|
||||||
>
|
>
|
||||||
<template slot="outerContent">
|
<template slot="outerContent">
|
||||||
<el-image
|
<!-- <el-image
|
||||||
:src="contractImgList[0]"
|
:src="contractImgList[0]"
|
||||||
:preview-src-list="contractImgList"
|
:preview-src-list="contractImgList"
|
||||||
v-if="dialogConfig.outerTitle === '合同图片详情'"
|
|
||||||
style="display: block; max-width: 100%; margin: 0 auto"
|
style="display: block; max-width: 100%; margin: 0 auto"
|
||||||
|
/> -->
|
||||||
|
|
||||||
|
<div
|
||||||
|
v-if="dialogConfig.outerTitle === '合同图片详情'"
|
||||||
|
class="contract-img-item-box"
|
||||||
|
>
|
||||||
|
<el-image
|
||||||
|
v-for="item in contractImgList"
|
||||||
|
:key="item"
|
||||||
|
fit="cover"
|
||||||
|
:src="item"
|
||||||
|
:preview-src-list="contractImgList"
|
||||||
|
style="height: 200px"
|
||||||
/>
|
/>
|
||||||
|
</div>
|
||||||
<ContractDetails
|
<ContractDetails
|
||||||
ref="contractDetailsRef"
|
ref="contractDetailsRef"
|
||||||
:contractInfo="contractInfo"
|
:contractInfo="contractInfo"
|
||||||
|
|
@ -169,8 +183,8 @@ export default {
|
||||||
.map((item) => item.lsUrl)
|
.map((item) => item.lsUrl)
|
||||||
this.dialogConfig.outerTitle = '合同图片详情'
|
this.dialogConfig.outerTitle = '合同图片详情'
|
||||||
this.dialogConfig.outerWidth = ''
|
this.dialogConfig.outerWidth = ''
|
||||||
this.dialogConfig.minHeight = '80vh'
|
this.dialogConfig.minHeight = ''
|
||||||
this.dialogConfig.maxHeight = '80vh'
|
this.dialogConfig.maxHeight = ''
|
||||||
this.dialogConfig.outerVisible = true
|
this.dialogConfig.outerVisible = true
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -109,12 +109,23 @@
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<template v-if="dialogConfig.outerTitle === '合同图片详情'">
|
<template v-if="dialogConfig.outerTitle === '合同图片详情'">
|
||||||
<el-image
|
<!-- <el-image
|
||||||
fit="cover"
|
fit="cover"
|
||||||
:src="contractImgList[0]"
|
:src="contractImgList[0]"
|
||||||
:preview-src-list="contractImgList"
|
:preview-src-list="contractImgList"
|
||||||
style="display: block; max-width: 90%; margin: 0 auto"
|
style="display: block; max-width: 90%; margin: 0 auto"
|
||||||
|
/> -->
|
||||||
|
|
||||||
|
<div class="contract-img-item-box">
|
||||||
|
<el-image
|
||||||
|
v-for="item in contractImgList"
|
||||||
|
:key="item"
|
||||||
|
fit="cover"
|
||||||
|
:src="item"
|
||||||
|
:preview-src-list="contractImgList"
|
||||||
|
style="height: 200px"
|
||||||
/>
|
/>
|
||||||
|
</div>
|
||||||
</template>
|
</template>
|
||||||
</template>
|
</template>
|
||||||
</DialogModel>
|
</DialogModel>
|
||||||
|
|
@ -233,8 +244,8 @@ export default {
|
||||||
.filter((item) => item.sourceType != 6)
|
.filter((item) => item.sourceType != 6)
|
||||||
.map((item) => item.lsUrl)
|
.map((item) => item.lsUrl)
|
||||||
this.dialogConfig.outerTitle = '合同图片详情'
|
this.dialogConfig.outerTitle = '合同图片详情'
|
||||||
this.dialogConfig.minHeight = '80vh'
|
this.dialogConfig.minHeight = ''
|
||||||
this.dialogConfig.maxHeight = '80vh'
|
this.dialogConfig.maxHeight = ''
|
||||||
this.dialogConfig.outerWidth = ''
|
this.dialogConfig.outerWidth = ''
|
||||||
this.dialogConfig.outerVisible = true
|
this.dialogConfig.outerVisible = true
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -99,11 +99,22 @@
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<template v-if="dialogConfig.outerTitle === '工资卡图片详情'">
|
<template v-if="dialogConfig.outerTitle === '工资卡图片详情'">
|
||||||
<el-image
|
<!-- <el-image
|
||||||
:src="contractImgList[0]"
|
:src="contractImgList[0]"
|
||||||
:preview-src-list="contractImgList"
|
:preview-src-list="contractImgList"
|
||||||
style="display: block; max-width: 100%; margin: 0 auto"
|
style="display: block; max-width: 100%; margin: 0 auto"
|
||||||
|
/> -->
|
||||||
|
|
||||||
|
<div class="contract-img-item-box">
|
||||||
|
<el-image
|
||||||
|
v-for="item in contractImgList"
|
||||||
|
:key="item"
|
||||||
|
fit="cover"
|
||||||
|
:src="item"
|
||||||
|
:preview-src-list="contractImgList"
|
||||||
|
style="height: 200px"
|
||||||
/>
|
/>
|
||||||
|
</div>
|
||||||
</template>
|
</template>
|
||||||
</template>
|
</template>
|
||||||
</DialogModel>
|
</DialogModel>
|
||||||
|
|
@ -193,8 +204,8 @@ export default {
|
||||||
.map((item) => item.lsUrl)
|
.map((item) => item.lsUrl)
|
||||||
|
|
||||||
this.dialogConfig.outerTitle = '工资卡图片详情'
|
this.dialogConfig.outerTitle = '工资卡图片详情'
|
||||||
this.dialogConfig.minHeight = '90vh'
|
this.dialogConfig.minHeight = ''
|
||||||
this.dialogConfig.maxHeight = '90vh'
|
this.dialogConfig.maxHeight = ''
|
||||||
this.dialogConfig.outerWidth = ''
|
this.dialogConfig.outerWidth = ''
|
||||||
this.dialogConfig.outerVisible = true
|
this.dialogConfig.outerVisible = true
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -75,6 +75,7 @@ export default {
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
initChart() {
|
initChart() {
|
||||||
|
console.log(this.threeData, 'this.threeData')
|
||||||
this.chart = echarts.init(this.$el, 'macarons')
|
this.chart = echarts.init(this.$el, 'macarons')
|
||||||
// const pieData = this.pieData.map((item) => ({
|
// const pieData = this.pieData.map((item) => ({
|
||||||
// ...item,
|
// ...item,
|
||||||
|
|
@ -82,6 +83,12 @@ export default {
|
||||||
// }))
|
// }))
|
||||||
|
|
||||||
const pieData = this.threeData
|
const pieData = this.threeData
|
||||||
|
|
||||||
|
const totalAmount = pieData.reduce(
|
||||||
|
(sum, item) => sum + item.value * 1,
|
||||||
|
0,
|
||||||
|
)
|
||||||
|
|
||||||
// 默认显示第一条数据
|
// 默认显示第一条数据
|
||||||
const defaultSelectedIndex = 0
|
const defaultSelectedIndex = 0
|
||||||
const defaultSelectedData = pieData[defaultSelectedIndex]
|
const defaultSelectedData = pieData[defaultSelectedIndex]
|
||||||
|
|
@ -99,17 +106,18 @@ export default {
|
||||||
itemWidth: 10,
|
itemWidth: 10,
|
||||||
itemHeight: 10,
|
itemHeight: 10,
|
||||||
selectedMode: false, // 关键点:关闭 legend 的交互
|
selectedMode: false, // 关键点:关闭 legend 的交互
|
||||||
formatter: function (name) {
|
formatter: (name) => {
|
||||||
// 获取对应的数据项
|
// 获取对应的数据项
|
||||||
const dataItem = pieData.find(
|
const dataItem = pieData.find(
|
||||||
(item) => item.name === name,
|
(item) => item.name === name,
|
||||||
)
|
)
|
||||||
const total = pieData.reduce(
|
if (!dataItem || totalAmount === 0) {
|
||||||
(sum, item) => sum + item.value,
|
return `{a|${
|
||||||
0,
|
dataItem?.value || 0
|
||||||
)
|
}} {b|${name}} {c|0%}`
|
||||||
|
}
|
||||||
const percent = (
|
const percent = (
|
||||||
(dataItem.value / total) *
|
(dataItem.value / totalAmount) *
|
||||||
100
|
100
|
||||||
).toFixed(1)
|
).toFixed(1)
|
||||||
return `{a|${dataItem.value}} {b|${name}} {c|${percent}%}`
|
return `{a|${dataItem.value}} {b|${name}} {c|${percent}%}`
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue