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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
xvv 2024-07-06 15:03:01 +08:00
commit 093e84ac92
9 changed files with 141 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fuintAdmin/src/assets/styles/element-ui.scss
View File

@ -77,6 +77,9 @@
.el-range-editor.el-input__inner {
display: inline-flex !important;
}
.el-input__inner:focus {
border-color: #FF9655 !important;
}
// to fix el-date-picker css style
.el-range-separator {

41
fuintAdmin/src/views/staff/storeInfo/index.vue
View File

@ -2,13 +2,13 @@
<div class="app-container">
<el-row>
<el-col :span="18">
<el-card class="card" style="height: 75vh">
<el-card class="card">
<div slot="header" class="clearfix">
<span>{{ store.name }}{{ store.description ? "(" + store.description + ")" : "" }}</span>
</div>
<el-row>
<el-col :span="12">
<!-- <el-col :span="12">-->
<!-- 上传图片-->
@ -26,8 +26,8 @@
<el-input v-model="store.refPass" style="width: 50%" show-password></el-input>
</p>
</div>
</el-col>
<el-col :span="12">
<!-- </el-col>-->
<!-- <el-col :span="12">-->
<map-componment :pform="form" ref="mapRef" @pform="getForm"></map-componment>
<div style="display: flex;margin-bottom: 20px">
@ -42,24 +42,30 @@
</el-checkbox-group>
</div>
</el-col>
<!-- </el-col>-->
</el-row>
<el-button type="primary" @click="submitStore">保存信息</el-button>
</el-card>
</el-col>
<el-col :span="6">
<el-card class="card" style="margin-left: 20px; height: 75vh">
<el-card class="card" style="margin-left: 20px;">
<div slot="header" class="clearfix">
<span>油站二维码</span>
</div>
<el-button style="margin-left: 0px" type="text" v-if="type==0" @click="getQRCodeInfoByStoreId(1)">切换样式</el-button><br/>
<el-button style="margin-left: 0px" type="text" v-if="type==1" @click="getQRCodeInfoByStoreId(0)">切换样式</el-button><br/>
<div style="position: relative;">
<img id="collection" class="qrcode" :src="baseUrl + collectionImg"/><br/>
<el-button class="but" type="primary"
icon="el-icon-download"
<div style="display: flex;justify-content: center;position: absolute;bottom: 25px;left: 90px" >
<el-button type="warning" size="small"
@click="handleDownloadqrCode('collection')">
下载油站二维码
下载图片
</el-button>
<el-button style="margin-left: 10px;color: #409EFF" size="small" v-if="type==0" @click="getQRCodeInfoByStoreId(1)">切换样式
</el-button>
<br/>
<el-button style="margin-left: 10px;color: #409EFF" size="small" v-if="type==1" @click="getQRCodeInfoByStoreId(0)">切换样式
</el-button>
</div>
</div>
</el-card>
</el-col>
</el-row>
@ -104,8 +110,10 @@ export default {
flag: false,
// 上传文件列表
uploadFiles: [
{name:"nihao",
url:'http://localhost:8080/static/uploadImages/20231218/c4b1c4fc7cfc4dd4a4acf1e922cacc86.png'}
{
name: "nihao",
url: 'http://localhost:8080/static/uploadImages/20231218/c4b1c4fc7cfc4dd4a4acf1e922cacc86.png'
}
],
// 门店二维码
collectionImg: '',
@ -275,18 +283,21 @@ export default {
height: 100%;
background: #f6f8f9;
}
.card {
margin: 15px auto;
}
.qrcode {
width: 300px;
width: 350px;
margin-top: 0px;
}
.but {
margin-top: 20px;
margin-left: 50px;
width: 180px;
}
.copy {
width: 50%;
margin-top: 20px;

3
fuintAdmin_zt/src/assets/styles/element-ui.scss
View File

@ -77,6 +77,9 @@
.el-range-editor.el-input__inner {
display: inline-flex !important;
}
.el-input__inner:focus {
border-color: #FF9655 !important;
}
// to fix el-date-picker css style
.el-range-separator {

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/impl/LJStaffServiceImpl.java
View File

@ -339,7 +339,7 @@ public class LJStaffServiceImpl extends ServiceImpl<LJStaffMapper, LJStaff> impl
LJStaff staff = this.selectStaffById(id);
LJStore store = storeService.selectStoreByStoreId(staff.getStoreId());
//在图片上生成二维码
String backgroundImage = "static/qrCodeImg/laigeyouhui_bg.jpg";
String backgroundImage = "static/qrCodeImg/mendian_bg2.png";
String logoImage = "static/qrCodeImg/logo.png";
// if (StringUtils.isNotEmpty(store.getLogo())){
// logoImage = store.getLogo();

20
fuintBackend/fuint-application/src/main/java/com/fuint/business/member/utils/QrCodeUtils.java
View File

@ -69,10 +69,10 @@ public class QrCodeUtils {
g.drawImage(srcImg, 0, 0, srcImgWidth, srcImgHeight, null);
//使用工具类生成二维码
// Image image = createQrCode(logoStream, url, 360, 360);
Image image = createQrCode(logoStream, url, 270, 270);
Image image = createQrCode(logoStream, url, 294, 294);
//将小图片绘到大图片上,500,300 .表示你的小图片在大图片上的位置。
// g.drawImage(image, (bufImg.getWidth()-360)/2, 320, null);
g.drawImage(image, (bufImg.getWidth()-270)/2, 153, null);
g.drawImage(image, (bufImg.getWidth()-294)/2, 139, null);
// 设置字体，样式，字体大小
// g.setFont(new Font("TimesRoman", Font.BOLD, 20));
g.setFont(chineseFont());
@ -90,18 +90,18 @@ public class QrCodeUtils {
LJStaff staff1 = staffService.selectStaffByStoreId(storeId);
// 店铺名称位置文字绘制到指定位置
g.drawString(store.getName(), returnX(g,bufImg.getWidth(),store.getName()), 300);
g.drawString(store.getName(), returnX(g,bufImg.getWidth(),store.getName()), 560);
// 加油员姓名位置文字绘制到指定位置
if (ObjectUtil.isNotEmpty(staff)) {
g.drawString("加油员："+staff.getRealName(), returnX(g, bufImg.getWidth(), "加油员："+staff.getRealName()), 750);
g.drawString("加油员："+staff.getRealName(), 50, 680);
}
// 站长名称位置文字绘制到指定位置
g.drawString("站长名称："+staff1.getRealName(), returnX(g, bufImg.getWidth(), "站长名称："+staff1.getRealName()), 810);
g.drawString("站长名称："+staff1.getRealName(), 50, 590);
// 服务监督电话位置文字绘制到指定位置
g.drawString("服务监督电话："+staff1.getMobile(), returnX(g, bufImg.getWidth(), "服务监督电话："+staff1.getMobile()), 870);
g.drawString("服务监督电话："+staff1.getMobile(), 50, 620);
// 店铺地址位置文字绘制到指定位置
// g.drawString(store.getAddress(), returnX(g,bufImg.getWidth(),store.getAddress()), 900);
drawStringWithMultiLine(g,store.getAddress(), bufImg.getWidth()-20,20,940,10 );
drawStringWithMultiLine(g,store.getAddress(), bufImg.getWidth()-90,51,650,5 );
}else {
drawStringWithMultiLine(g,"欢迎光临", bufImg.getWidth()-20,20,940,10 );
g.drawString("欢迎光临：", returnX(g, bufImg.getWidth(), "服务监督电话："), 870);
@ -306,17 +306,17 @@ public class QrCodeUtils {
// Font font = Font.createFont(Font.TRUETYPE_FONT, new ClassPathResource("classpath:font/msyh.ttc").getFile());
// b = font.deriveFont(Font.BOLD, 40);
b = new Font("TimesRoman", Font.BOLD, 40);
b = new Font("TimesRoman", Font.BOLD, 16);
} else {
prefixFont = "/usr/share/fonts" + File.separator + "msyh.ttc";
try {
Font font = Font.createFont(Font.TRUETYPE_FONT, new File(prefixFont));
b = font.deriveFont(Font.BOLD, 40);
b = font.deriveFont(Font.BOLD, 16);
// b = new Font("msyh", Font.BOLD, 40);
} catch (Exception e) {
//如果发生异常执行默认的字体
b = new Font("msyh", Font.BOLD, 40);
b = new Font("msyh", Font.BOLD, 16);
log.error(e.getMessage(),"找不到字体");
}

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/service/impl/QRCodeServiceImpl.java
View File

@ -60,9 +60,9 @@ public class QRCodeServiceImpl extends ServiceImpl<QRCodeMapper, QRCode> impleme
//在图片上生成二维码
String backgroundImage = "";
if (type.equals("0")){
backgroundImage = "static/qrCodeImg/mendian_bg1.png";
}else {
backgroundImage = "static/qrCodeImg/mendian_bg2.png";
}else {
backgroundImage = "static/qrCodeImg/mendian_bg1.png";
}
String logoImage = "static/qrCodeImg/logo.png";

BIN
fuintBackend/fuint-application/src/main/resources/static/qrCodeImg/mendian_bg1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 72 KiB

After

Width:  |  Height:  |  Size: 78 KiB

BIN
fuintBackend/fuint-application/src/main/resources/static/qrCodeImg/mendian_bg2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 77 KiB

After

Width:  |  Height:  |  Size: 70 KiB

3
fuintCashierWeb/src/assets/styles/element-ui.scss
View File

@ -77,6 +77,9 @@
.el-range-editor.el-input__inner {
display: inline-flex !important;
}
.el-input__inner:focus {
border-color: #FF9655 !important;
}
// to fix el-date-picker css style
.el-range-separator {