From 6b0852bbbc8174773e2dab428d3039d32feb8b9e Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Mon, 8 Aug 2022 11:06:43 +0800 Subject: [PATCH 1/4] =?UTF-8?q?css=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/girdScoreManage.vue | 18 ++++++++++++------ .../components/gridScoreDetail.vue | 2 +- .../components/gridScoreStatistics.vue | 4 ++-- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/packages/conv/creditScore/AppGridMemberScore/components/girdScoreManage.vue b/packages/conv/creditScore/AppGridMemberScore/components/girdScoreManage.vue index ace0db76..3f16c2be 100644 --- a/packages/conv/creditScore/AppGridMemberScore/components/girdScoreManage.vue +++ b/packages/conv/creditScore/AppGridMemberScore/components/girdScoreManage.vue @@ -39,7 +39,7 @@ - + - + @@ -94,15 +98,17 @@ export default { tableData: [], page: {current: 1, size: 10, total: 0}, girdList: [], - dialog: true, + form: { }, personList: [], + dialog: false, + radio: '' } }, created() { - this.$dict.load('integralCalcType') + // this.$dict.load('integralCalcType') }, computed: { ...mapState(['user']), diff --git a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreDetail.vue b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreDetail.vue index da84642a..a0da50bf 100644 --- a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreDetail.vue +++ b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreDetail.vue @@ -103,7 +103,7 @@ export default { methods: { getColEcherts() { let chartDom = document.getElementById('chartDom'); - chartDom.style.width = window.innerWidth - 328 + "px"; + chartDom.style.width = window.innerWidth - 335 + "px"; this.myChart = echarts.init(chartDom); this.myChart.setOption({ dataZoom: [ diff --git a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreStatistics.vue b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreStatistics.vue index 5795bc6d..3ac96533 100644 --- a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreStatistics.vue +++ b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreStatistics.vue @@ -162,7 +162,7 @@ export default { methods: { getColEcherts1() { let chartDom1 = document.getElementById('chart1'); - chartDom1.style.width = (window.innerWidth - 344) / 2 + "px"; + chartDom1.style.width = (window.innerWidth - 435) / 2 + "px"; this.myChart1 = echarts.init(chartDom1); this.myChart1.setOption({ @@ -223,7 +223,7 @@ export default { }, getColEcherts2() { let chartDom2 = document.getElementById('chart2'); - chartDom2.style.width = (window.innerWidth - 344) / 2 + "px"; + chartDom2.style.width = (window.innerWidth - 435) / 2 + "px"; this.myChart2 = echarts.init(chartDom2); this.myChart2.setOption({ title: { From 2ee8676c4e52dcdd423889119462adfe03181194 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Mon, 8 Aug 2022 11:24:16 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppAnnounce/components/Detail.vue | 67 ++++++++++++------- .../Announce/AppAnnounce/components/List.vue | 52 ++++++++------ 2 files changed, 74 insertions(+), 45 deletions(-) diff --git a/project/sass/apps/Announce/AppAnnounce/components/Detail.vue b/project/sass/apps/Announce/AppAnnounce/components/Detail.vue index c3634670..5b1900c0 100644 --- a/project/sass/apps/Announce/AppAnnounce/components/Detail.vue +++ b/project/sass/apps/Announce/AppAnnounce/components/Detail.vue @@ -121,13 +121,14 @@ 已执行 无法执行 -
- - 请选择部门 - -
选择
- -
+ +
+ + 请选择部门 + + +
+ {{ isDisabled ? min + '分钟后可再次提醒' : '提醒成员发送' }} @@ -190,13 +191,14 @@ 已送达 无法送达 -
- - 请选择部门 - -
选择
- -
+ +
+ + 请选择部门 + + +
+ {{ isDisabled ? min + '分钟后可再次提醒' : '提醒成员发送' }} @@ -513,32 +515,45 @@ .userSelcet { display: flex; align-items: center; + justify-content: space-between; + width: 215px; height: 32px; line-height: 32px; margin-left: 12px; border-radius: 4px; border: 1px solid #d0d4dc; overflow: hidden; + cursor: pointer; + transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1); - .select-btn { - width: 40px; - cursor: pointer; + &:hover { + border-color: #26f; + } + + i { + display: flex; + position: relative; + align-items: center; + justify-content: center; + width: 30px; + height: 100%; + line-height: 32px; + font-size: 14px; text-align: center; - border-left: 1px solid #d0d4dc; - color: #666; - font-size: 12px; + color: #d0d4dc; + transform: rotateZ(180deg); + } - &:hover { - color: #2266FF; - } + .el-icon-circle-close:hover { + opacity: 0.6; } span { - width: 200px; + flex: 1; padding: 0 15px; font-size: 12px; - background: #F5F5F5; - color: #999; + // background: #F5F5F5; + color: #d0d4dc; } } diff --git a/project/sass/apps/Announce/AppAnnounce/components/List.vue b/project/sass/apps/Announce/AppAnnounce/components/List.vue index 646ad150..1661c8c0 100644 --- a/project/sass/apps/Announce/AppAnnounce/components/List.vue +++ b/project/sass/apps/Announce/AppAnnounce/components/List.vue @@ -33,13 +33,14 @@ @change="search.current = 1, getList()" placeholder="选择群发结束日期"> -
- - 创建人 - -
选择
- -
+ +
+ + 创建人 + + +
+