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

Compare commits

base: dianliang:02b5c2b22e87a26c135adb417562f8540bb75390
Branches Tags
dianliang:main
dianliang:master
..
compare: dianliang:886aaf2b890ab1b942bb8dd6ec0f7ad276b7e772
Branches Tags
dianliang:main
dianliang:master

2 Commits
02b5c2b22e ... 886aaf2b89

Author SHA1 Message Date
sw
886aaf2b89 Merge remote-tracking branch 'origin/main' 2024-11-21 09:56:55 +08:00
sw
428c741a93 11.19 2024-11-21 09:56:45 +08:00
4 changed files with 10 additions and 6 deletions
Show Stats Expand all files Collapse all files

4
fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue
View File

@ -42,8 +42,8 @@
<el-table-column prop="activityProgress" label="活动状态" align="center" > <el-table-column prop="activityProgress" label="活动状态" align="center" >
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.isonline == 0"> <el-tag>已上架</el-tag></span> <span v-if="scope.row.isonline == 0"> <el-tag type="success">已上架</el-tag></span>
<span v-if="scope.row.isonline == 1"> <el-tag>已下架</el-tag></span> <span v-if="scope.row.isonline == 1"> <el-tag type="danger" >已下架</el-tag></span>
</template> </template>
</el-table-column> </el-table-column>

5
fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue
View File

@ -56,10 +56,11 @@
<el-table-column <el-table-column
prop="activeStatus" prop="activeStatus"
label="活动状态" label="活动状态"
align="center"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.activeStatus == 0"> <el-tag>已上架</el-tag></span> <span v-if="scope.row.activeStatus == 0"> <el-tag type="success">已上架</el-tag></span>
<span v-if="scope.row.activeStatus == 1"> <el-tag>已下架</el-tag></span> <span v-if="scope.row.activeStatus == 1"> <el-tag type="danger">已下架</el-tag></span>
</template> </template>

4
fuintAdmin/src/views/convenienceStore/inventory/index.vue
View File

@ -70,9 +70,9 @@
<template slot-scope="scope"> <template slot-scope="scope">
<div slot="reference" class="name-wrapper"> <div slot="reference" class="name-wrapper">
<div style="color: #FF9655" v-if="scope.row.approvalStatus == 'await'">待审核</div> <div style="color: #FF9655" v-if="scope.row.approvalStatus == 'await'">待审核</div>
<div style="color: #0DC291" v-if="scope.row.approvalStatus == 'qrts'" >已审核入库</div> <div style="color: #0DC291" v-if="scope.row.approvalStatus == 'qrts'" >已入库</div>
<div style="color: #F44522" v-if="scope.row.approvalStatus == 'yzf'">已作废</div> <div style="color: #F44522" v-if="scope.row.approvalStatus == 'yzf'">已作废</div>
<div style="color: #409EFF" v-if="scope.row.approvalStatus == 'ysh'" >已审核</div> <div style="color: #409EFF" v-if="scope.row.approvalStatus == 'ysh'" >待入库</div>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>

3
fuintBackend/fuint-application/src/main/java/com/fuint/business/setting/service/impl/SysLogServiceImpl.java
View File

@ -40,6 +40,8 @@ public class SysLogServiceImpl extends ServiceImpl<SysLogMapper, SysLog> impleme
if (ipAddress == null || ipAddress.length() == 0 || "unknown".equalsIgnoreCase(ipAddress)) { if (ipAddress == null || ipAddress.length() == 0 || "unknown".equalsIgnoreCase(ipAddress)) {
ipAddress = request.getRemoteAddr(); ipAddress = request.getRemoteAddr();
} }
String mm= request.getHeader("CLIENT");
sysLog.setIpAddr(ipAddress); sysLog.setIpAddr(ipAddress);
//获取当前登录用户 //获取当前登录用户
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
@ -48,6 +50,7 @@ public class SysLogServiceImpl extends ServiceImpl<SysLogMapper, SysLog> impleme
SysDept sysDept = deptService.selectDeptById(nowAccountInfo.getDeptId()); SysDept sysDept = deptService.selectDeptById(nowAccountInfo.getDeptId());
sysLog.setDeptId(sysDept.getDeptId().toString()); sysLog.setDeptId(sysDept.getDeptId().toString());
sysLog.setDeptName(sysDept.getDeptName()); sysLog.setDeptName(sysDept.getDeptName());
// sysLog.setSystemName(mm);
this.save(sysLog); this.save(sysLog);
} }
} }