From 428c741a937dff745ebb7ee04e7ad18df8d1b16e Mon Sep 17 00:00:00 2001
From: sw <17615834396@163.com>
Date: Thu, 21 Nov 2024 09:56:45 +0800
Subject: [PATCH] 11.19

---
 fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue      | 4 ++--
 fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue  | 5 +++--
 fuintAdmin/src/views/convenienceStore/inventory/index.vue    | 4 ++--
 .../business/setting/service/impl/SysLogServiceImpl.java     | 3 +++
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue b/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue
index 2bc4343dc..456b73127 100644
--- a/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue
@@ -42,8 +42,8 @@
 
               <el-table-column prop="activityProgress" label="活动状态" align="center" >
                 <template slot-scope="scope">
-                  <span v-if="scope.row.isonline == 0"> <el-tag>已上架</el-tag></span>
-                  <span v-if="scope.row.isonline == 1"> <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 type="danger" >已下架</el-tag></span>
 
                 </template>
               </el-table-column>
diff --git a/fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue b/fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue
index 6bb682b7d..882862587 100644
--- a/fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue
@@ -56,10 +56,11 @@
         <el-table-column
           prop="activeStatus"
           label="活动状态"
+          align="center"
         >
           <template slot-scope="scope">
-            <span v-if="scope.row.activeStatus == 0"> <el-tag>已上架</el-tag></span>
-            <span v-if="scope.row.activeStatus == 1"> <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 type="danger">已下架</el-tag></span>
 
 
           </template>
diff --git a/fuintAdmin/src/views/convenienceStore/inventory/index.vue b/fuintAdmin/src/views/convenienceStore/inventory/index.vue
index 9be4bcdc5..558f7083f 100644
--- a/fuintAdmin/src/views/convenienceStore/inventory/index.vue
+++ b/fuintAdmin/src/views/convenienceStore/inventory/index.vue
@@ -70,9 +70,9 @@
             <template slot-scope="scope">
               <div slot="reference" class="name-wrapper">
                 <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: #409EFF" v-if="scope.row.approvalStatus == 'ysh'" >已审核</div>
+                <div style="color: #409EFF" v-if="scope.row.approvalStatus == 'ysh'" >待入库</div>
               </div>
             </template>
           </el-table-column>
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/setting/service/impl/SysLogServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/setting/service/impl/SysLogServiceImpl.java
index 138f46d5b..66f3c6455 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/setting/service/impl/SysLogServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/setting/service/impl/SysLogServiceImpl.java
@@ -40,6 +40,8 @@ public class SysLogServiceImpl extends ServiceImpl<SysLogMapper, SysLog> impleme
         if (ipAddress == null || ipAddress.length() == 0 || "unknown".equalsIgnoreCase(ipAddress)) {
             ipAddress = request.getRemoteAddr();
         }
+
+        String mm= request.getHeader("CLIENT");
         sysLog.setIpAddr(ipAddress);
         //获取当前登录用户
         AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
@@ -48,6 +50,7 @@ public class SysLogServiceImpl extends ServiceImpl<SysLogMapper, SysLog> impleme
         SysDept sysDept = deptService.selectDeptById(nowAccountInfo.getDeptId());
         sysLog.setDeptId(sysDept.getDeptId().toString());
         sysLog.setDeptName(sysDept.getDeptName());
+ //       sysLog.setSystemName(mm);
         this.save(sysLog);
     }
 }