Compare commits

..

No commits in common. "a595bc46bd6adf695d586fff3ce1b25677e44039" and "1dae37bbb4e189811893f06a759d183ffd9a8ee0" have entirely different histories.

6 changed files with 21 additions and 20 deletions

View File

@ -69,8 +69,8 @@ export default {
width: 100%; width: 100%;
& .sidebar-logo { & .sidebar-logo {
width: 26px; width: 36px;
height: 26px; height: 36px;
vertical-align: middle; vertical-align: middle;
margin-right: 12px; margin-right: 12px;
} }

View File

@ -2,7 +2,7 @@
* @Author: zwq * @Author: zwq
* @Date: 2022-01-21 14:43:06 * @Date: 2022-01-21 14:43:06
* @LastEditors: zwq * @LastEditors: zwq
* @LastEditTime: 2022-11-11 15:27:23 * @LastEditTime: 2022-11-08 15:09:11
* @Description: * @Description:
--> -->
<template> <template>
@ -113,7 +113,6 @@ export default {
a: { a: {
align: 'center', align: 'center',
fontSize: 13, fontSize: 13,
fontWeight: 400,
color: 'rgba(255, 255, 255, 0.7)', color: 'rgba(255, 255, 255, 0.7)',
padding: [0, 4], padding: [0, 4],
lineHeight: 16 lineHeight: 16
@ -121,8 +120,8 @@ export default {
b: { b: {
// verticalAlign: 'top', // verticalAlign: 'top',
align: 'center', align: 'center',
padding: [0, 4],
fontSize: 13, fontSize: 13,
fontWeight: 400,
color: 'rgba(255, 255, 255)' color: 'rgba(255, 255, 255)'
}, },
c: { c: {
@ -214,20 +213,19 @@ export default {
? { ? {
text: this.seriesData.reduce((pre, cur) => pre + cur.value, 0), text: this.seriesData.reduce((pre, cur) => pre + cur.value, 0),
subtext: '总共', subtext: '总共',
top: '48%', top: '45%',
left: '59%', left: '59%',
textAlign: 'center', textAlign: 'center',
itemGap: 5, itemGap: 5,
textStyle: { textStyle: {
color: '#fff', color: '#fff',
fontSize: 26, fontSize: 22,
fontWeight: 400, fontWeight: 'lighter',
lineHeight: 15 lineHeight: 15
}, },
subtextStyle: { subtextStyle: {
color: 'rgba(255, 255, 255, 0.7)', color: '#c0c0c0',
fontWeight: 400, fontSize: 12,
fontSize: 14,
lineHeight: 20 lineHeight: 20
} }
} }

View File

@ -2,7 +2,7 @@
* @Author: zwq * @Author: zwq
* @Date: 2021-07-19 15:18:30 * @Date: 2021-07-19 15:18:30
* @LastEditors: zwq * @LastEditors: zwq
* @LastEditTime: 2022-11-11 15:14:51 * @LastEditTime: 2022-11-08 15:50:35
* @Description: * @Description:
--> -->
<template> <template>
@ -126,7 +126,7 @@
<new-pie <new-pie
:id="'pie-chart1'" :id="'pie-chart1'"
:show-center-title="true" :show-center-title="true"
:legend-config="{ left: '1%', top: '30%', itemGap: 5 }" :legend-config="{ left: '2%', top: '30%', itemGap: 10 }"
:series-data="legendData1" :series-data="legendData1"
:beilv="beilv" :beilv="beilv"
:height="226" :height="226"
@ -155,7 +155,7 @@
<new-pie <new-pie
:id="'pie-chart3'" :id="'pie-chart3'"
:show-center-title="true" :show-center-title="true"
:legend-config="{ left: '1%', top: '30%', itemGap: 5 }" :legend-config="{ left: '2%', top: '30%', itemGap: 10 }"
:series-data="legendData3" :series-data="legendData3"
:beilv="beilv" :beilv="beilv"
:height="226" :height="226"
@ -613,7 +613,7 @@ export default {
background: url('../../assets/img/OperationalOverview/title (2).png') no-repeat; background: url('../../assets/img/OperationalOverview/title (2).png') no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
color: #fff; color: #fff;
padding-left: 41%; text-align: center;
.title-button { .title-button {
color: #00fff0; color: #00fff0;
position: absolute; position: absolute;

View File

@ -1,7 +1,7 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<head-form :form-config="headFormConfig" @headBtnClick="btnClick" /> <head-form :form-config="headFormConfig" @headBtnClick="btnClick" />
<div style="text-align:left"> <div style="text-align:right">
<span>合计 265395</span> <span>合计 265395</span>
</div> </div>
<base-table <base-table

View File

@ -9,7 +9,7 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<head-form :form-config="headFormConfig" @headBtnClick="btnClick" /> <head-form :form-config="headFormConfig" @headBtnClick="btnClick" />
<div style="text-align:left"> <div style="text-align:right">
<span>合计 265395</span> <span>合计 265395</span>
</div> </div>
<base-table <base-table

View File

@ -61,10 +61,12 @@ const tableProps = [{
align: 'center' align: 'center'
}, { }, {
prop: 'name', prop: 'name',
label: i18n.t('roleManage.roleName') label: i18n.t('roleManage.roleName'),
align: 'center'
}, { }, {
prop: 'enabled', prop: 'enabled',
label: i18n.t('roleManage.status') label: i18n.t('roleManage.status'),
align: 'center'
}, },
// { // {
// prop: 'category', // prop: 'category',
@ -74,7 +76,8 @@ const tableProps = [{
// }, // },
{ {
prop: 'remark', prop: 'remark',
label: i18n.t('roleManage.remark') label: i18n.t('roleManage.remark'),
align: 'center'
}] }]
import AddForm from './AddForm' import AddForm from './AddForm'
import EditForm from './EditForm' import EditForm from './EditForm'