Browse Source

Merge remote-tracking branch 'origin/master'

master
王梦远 3 weeks ago
parent
commit
074fdd6693
  1. 3
      src/assets/styles/variable.scss
  2. 2
      src/components/home/config.vue
  3. 2
      src/views/home/chart.vue

3
src/assets/styles/variable.scss

@ -3,5 +3,6 @@ $success-color: #14A656;
$danger-color: #DF1515; $danger-color: #DF1515;
$warn-color: #EE8223; $warn-color: #EE8223;
$info-color: #909399; $info-color: #909399;
$gradient-color: linear-gradient(185deg, rgb(175 216 255) -90%, #fff 24%);
//$gradient-color: linear-gradient(185deg, rgb(175 216 255) -90%, #fff 24%);
$gradient-color: #fff;
$main-container-height: calc(100vh - 17vh) $main-container-height: calc(100vh - 17vh)

2
src/components/home/config.vue

@ -152,7 +152,7 @@ const onDefaultFormula = () => {
.main-content{ .main-content{
overflow: hidden; overflow: hidden;
height: $main-container-height; height: $main-container-height;
background: $gradient-color;
//background: $gradient-color;
padding: 15px; padding: 15px;
.formula-config{ .formula-config{
display: grid; display: grid;

2
src/views/home/chart.vue

@ -167,7 +167,7 @@ const onClose = () => {
/> />
</div> </div>
</div> </div>
<ft-dialog v-model="disinfectFormulaVisible" width="80vw" :ok-handle="onSave" @cancel="onClose">
<ft-dialog v-model="disinfectFormulaVisible" title="消毒设置" width="80vw" :ok-handle="onSave" @cancel="onClose">
<div> <div>
<Config ref="configRef" /> <Config ref="configRef" />
</div> </div>

Loading…
Cancel
Save