Compare commits

..

4 Commits

Author SHA1 Message Date
a595bc46bd 11.14修改样式 2022-11-14 16:50:39 +08:00
19fd321a4e Merge pull request '更新驾驶舱' (#13) from zwq into master
Reviewed-on: #13
2022-11-14 14:48:32 +08:00
zwq
ab8848b6e3 更新驾驶舱 2022-11-14 14:47:57 +08:00
23bb88b20c Merge pull request '11-wms-zjl' (#12) from 11-wms-zjl into master
Reviewed-on: #12
2022-11-11 10:56:47 +08:00
6 changed files with 20 additions and 21 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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