dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
DESKTOP-369JRHT\12997 2024-07-04 15:25:11 +08:00
parent 8e63b8d2e3
commit a38c32f263
5 changed files with 66 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
fuintAdmin/src/assets/fonts/Source Han Sans CN Regular.otf Normal file
View File

Binary file not shown.

BIN
fuintAdmin/src/assets/fonts/YouSheBiaoTiHei.ttf Normal file
View File

Binary file not shown.

8
fuintAdmin/src/assets/styles/fonts.css Normal file
View File

@ -0,0 +1,8 @@
@font-face {
font-family: 'YouSheBiaoTiHei';
src: url("../fonts/YouSheBiaoTiHei.ttf");
}
@font-face {
font-family: 'Source Han Sans CN';
src: url("../fonts/Source Han Sans CN Regular.otf");
}

5
fuintAdmin/src/main.js
View File

@ -18,6 +18,11 @@ import './assets/icons' // icon
import './permission' // permission control
import { getConfigKey } from "@/api/system/config";
import { parseTime, resetForm, addDateRange, getName, handleTree } from "@/utils/fuint";
import '@/assets/styles/fonts.css' //字体样式
// 分页组件
import Pagination from "@/components/Pagination";
// 自定义表格工具组件

67
fuintAdmin/src/views/oilConfig/oilGun/list.vue
View File

@ -14,23 +14,27 @@
</div>
</div>
<div class="conten-bottom">
<div class="cardbox" :class="{ 'act-cardbox': item.status == '启用' }" v-for="(item,index) in item.oilGunList" :key="index">
<div class="cardbox" :class="{ 'act-cardbox': item.status == '启用' ,'boxborder': item.status == '启用' }" v-for="(item,index) in item.oilGunList" :key="index">
<div class="cardbox-top" :class="{ 'actcolor':item.status == '启用' }">
<div>{{item.tankName}}</div>
<div style="cursor: pointer" ><i class="el-icon-edit" @click="gunEdit(item)"></i> <i class="el-icon-delete" @click="delGun(item.id)"></i></div>
<div style="cursor: pointer" ><i class="el-icon-edit-outline
" @click="gunEdit(item)"></i> <i class="el-icon-delete" @click="delGun(item.id)"></i></div>
</div>
<img class="cardbox-rd" src="./imgs/r-img.png" alt="">
<img v-if="item.status == '启用'" class="cardbox-rd" src="./imgs/r-img.png" alt="">
<div class="cardbox-title">
<div>{{item.gunName}}</div>
<div class="cardbox-gunName">{{item.gunName}}</div>
</div>
<div class="cardbox-bottom" :class="{ 'actcolor':item.status == '启用' }">
<!-- <div>ID:{{ item.id }}</div>-->
</div>
<template v-if="item.status == '启用'">
<div class="cardboxb" v-if="item.oilMachineGunNumber != null ">
<div>{{item.oilMachineGunNumber}}</div>
<div >{{item.oilMachineGunNumber}}</div>
</div>
</template>
</div>
</div>
@ -129,7 +133,7 @@
</el-form>
<span slot="footer" class="dialog-footer">
<!--/* <el-button v-if="judgement" type="danger" @click="delGun()" style="float: left;">删除</el-button>*/-->
<el-button @click="dialogVisible = false">取 消</el-button>
<el-button @click="dialogVisible = false,getList()">取 消</el-button>
<el-button type="primary" @click="submitForm()">确 定</el-button>
</span>
</el-dialog>
@ -388,16 +392,25 @@ import {cleanTankApi} from "@/api/oilConfig/oilTank";
flex-wrap: wrap;
}
.cardbox{
margin-right: 10px;
margin-bottom: 10px;
height: 87px;
width: 278px;
margin-right: 35px;
margin-bottom: 35px;
box-sizing: border-box;
padding: 10px;
border-radius: 4px;
width: 19%;
border-radius: 10px;
//width: 19%;
background-size:40% 70%;
background-color: #f9f9f9;
position: relative;
}
.boxborder {
border-color: #FF9655;
border:1px solid;
}
.cardbox-rd{
position: absolute;
@ -408,19 +421,25 @@ import {cleanTankApi} from "@/api/oilConfig/oilTank";
}
.act-cardbox{
margin-right: 35px;
height: 87px;
width: 278px;
position: relative;
overflow: hidden;
margin-right: 10px;
margin-bottom: 10px;
//margin-right: 10px;
margin-bottom: 35px;
box-sizing: border-box;
padding: 10px;
border-radius: 4px;
width: 19%;
border-radius: 10px;
//width: 19%;
//background: url(../../../assets/images/jybjj.png) center no-repeat;
background-size:40% 70%;
background-color: #fff9f5;
color: #FF9655 !important;
}
.cardboxb{
position: absolute;
/*width: 50px;*/
@ -447,7 +466,10 @@ import {cleanTankApi} from "@/api/oilConfig/oilTank";
justify-content: space-between;
width: 100%;
color: #5b5e62;
font-size: 14px;
font-size: 12px;
font-family: Source Han Sans CN;
//font-weight: 400;
}
.cardbox-title{
width: 100%;
@ -456,7 +478,19 @@ import {cleanTankApi} from "@/api/oilConfig/oilTank";
justify-content: center;
font-weight: bold;
font-size: 28px;
margin: 15px 0px;
//margin: 15px 0px;
}
.cardbox-gunName{
font-family: YouSheBiaoTiHei, YouSheBiaoTiHei;
font-weight: 400;
font-size: 28px;
//color: #FF9655;
//line-height: 0px;
//text-align: center;
//font-style: normal;
//text-transform: none;
}
.cardbox-bottom{
display: flex;
@ -478,4 +512,5 @@ import {cleanTankApi} from "@/api/oilConfig/oilTank";
width: 100%;
}
</style>