From 88f1335bed55f40db7c47000c1552aa17f09dbb3 Mon Sep 17 00:00:00 2001
From: chenlinlin <huxin02@aisino.com>
Date: Fri, 29 Aug 2025 20:03:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BC=81=E4=B8=9A=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=EF=BC=8Cexcel=E6=A8=A1=E7=89=88=E4=B8=AD=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E4=BC=81=E4=B8=9A=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/router/index.js                    |  2 +-
 client/src/views/big-screen/bigdata.vue       |  2 +-
 .../src/views/dtsjygl/enterprise/qyjbxx.vue   | 21 +------------------
 .../com/aisino/iles/core/model/LoginLog.java  |  1 -
 .../com/aisino/iles/core/util/TokenUtil.java  |  1 +
 5 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/client/src/router/index.js b/client/src/router/index.js
index 9bd12e5..e68a068 100644
--- a/client/src/router/index.js
+++ b/client/src/router/index.js
@@ -57,7 +57,7 @@ const baseRoutes = [
         ],
     },
     {
-
+        path: '/jbts/login',
         name: '_jbts_login',
         component: () => import('@views/jbts/login.vue'),
         meta: {
diff --git a/client/src/views/big-screen/bigdata.vue b/client/src/views/big-screen/bigdata.vue
index af3730b..3b8cecc 100644
--- a/client/src/views/big-screen/bigdata.vue
+++ b/client/src/views/big-screen/bigdata.vue
@@ -2541,7 +2541,7 @@ const login = async () => {
   let password = CryptoJS.MD5('Pe26957381').toString()
   let param = {username: username, password: password}
   let jsonString = JSON.stringify(param)
-
+  let urlEncodedString = encodeURIComponent(jsonString)
   let login_info = btoa(urlEncodedString)
   try {
     const response = await axios.post('/rest/index/login/login', {login_info: login_info})
diff --git a/client/src/views/dtsjygl/enterprise/qyjbxx.vue b/client/src/views/dtsjygl/enterprise/qyjbxx.vue
index 2eee686..a832e08 100644
--- a/client/src/views/dtsjygl/enterprise/qyjbxx.vue
+++ b/client/src/views/dtsjygl/enterprise/qyjbxx.vue
@@ -29,26 +29,7 @@
     <el-col :span="24" style="border-top: 1px solid #ebeef5; border-bottom: 1px solid #ebeef5; margin-bottom: 10px;">
       <div style="text-align: center; font-size: 16px; font-weight: 600; width: 100%; padding: 8px 0;">以下为一般指标项：（选填）</div>
     </el-col>
-    <el-col :span="12"><el-form-item label="邮政编码" prop="postalCode"><el-input :disabled="dc.mode !== 'add' && dc.mode !== 'modify'" v-model="dc.data.postalCode"/></el-form-item></el-col>
-    <el-col :span="12"><el-form-item label-width="100px" label="国民经济类型" prop="economicType"><el-select :disabled="dc.mode !== 'add' && dc.mode !== 'modify'" v-model="dc.data.economicType" clearable><el-option v-for="item in DICTITEMS.GMJJLX_OPTIONS" :key="item.value" :label="item.label" :value="item.value"></el-option></el-select></el-form-item></el-col>
-    <el-col :span="12"><el-form-item label-width="140px" label="法定代表人证件类型" prop="legalPersonIdType"><el-select :disabled="dc.mode !== 'add' && dc.mode !== 'modify'" v-model="dc.data.legalPersonIdType" clearable><el-option v-for="item in DICTITEMS.ZJLX_OPTIONS" :key="item.value" :label="item.label" :value="item.value"></el-option></el-select></el-form-item></el-col>
-    <el-col :span="12"><el-form-item label-width="140px" label="法定代表人证件号码" prop="legalPersonIdNumber"><el-input :disabled="dc.mode !== 'add' && dc.mode !== 'modify'" v-model="dc.data.legalPersonIdNumber"/></el-form-item></el-col>
-    <el-col :span="12"><el-form-item label-width="160px" label="企业是否位于化工园区" prop="isInChemicalPark"><el-radio-group :disabled="dc.mode !== 'add' && dc.mode !== 'modify'" v-model="dc.data.isInChemicalPark"><el-radio v-for="item in DICTITEMS.SF_OPTIONS" :key="item.value" :label="item.value">{{ item.label }}</el-radio></el-radio-group></el-form-item></el-col>
-    <el-col :span="12"><el-form-item label-width="110px" label="营业执照有效期" prop="expiryDate"><el-date-picker :disabled="dc.mode !== 'add' && dc.mode !== 'modify'" v-model="dc.data.expiryDate" style="width: 100%;" type="date" value-format="YYYY-MM-DD" placeholder="选择日期"/></el-form-item></el-col>
-    <el-col :span="12"><el-form-item label-width="100px" label="组织机构代码" prop="orgCode"><el-input :disabled="dc.mode !== 'add' && dc.mode !== 'modify'" v-model="dc.data.orgCode"/></el-form-item></el-col>
-    <el-col :span="12"><el-form-item label="企业规模" prop="unitScale"><el-select :disabled="dc.mode !== 'add' && dc.mode !== 'modify'" v-model="dc.data.unitScale" clearable><el-option v-for="item in DICTITEMS.QYGM_OPTIONS" :key="item.value" :label="item.label" :value="item.value"></el-option></el-select></el-form-item></el-col>
-    <el-col :span="12"><el-form-item label="成立日期" prop="establishmentDate"><el-date-picker :disabled="dc.mode !== 'add' && dc.mode !== 'modify'" v-model="dc.data.establishmentDate" style="width: 100%;" type="date" value-format="YYYY-MM-DD" placeholder="选择日期"/></el-form-item></el-col>
-    <el-col :span="12"><el-form-item label="注册资本" prop="registeredCapital"><el-input :disabled="dc.mode !== 'add' && dc.mode !== 'modify'" v-model="dc.data.registeredCapital"><template #suffix>万元</template></el-input></el-form-item></el-col>
-    <el-col :span="12"><el-form-item label-width="130px" label="所在地坐标：经度" prop="longitude"><el-input :disabled="dc.mode !== 'add' && dc.mode !== 'modify'" v-model="dc.data.longitude"><template #suffix>(度)</template></el-input></el-form-item></el-col>
-    <el-col :span="12"><el-form-item label-width="130px" label="所在地坐标：纬度" prop="latitude"><el-input :disabled="dc.mode !== 'add' && dc.mode !== 'modify'" v-model="dc.data.latitude"><template #suffix>(度)</template></el-input></el-form-item></el-col>
-    <el-col :span="12"><el-form-item label-width="130px" label="登记注册企业类别" prop="registrationType"><el-select :disabled="dc.mode !== 'add' && dc.mode !== 'modify'" v-model="dc.data.registrationType" clearable><el-option v-for="item in DICTITEMS.DQZCQYLB_OPTIONS" :key="item.value" :label="item.label" :value="item.value"></el-option></el-select></el-form-item></el-col>
-    <el-col :span="12"><el-form-item label-width="85px" label="许可证编号" prop="licenseNumber"><el-input :disabled="dc.mode !== 'add' && dc.mode !== 'modify'" v-model="dc.data.licenseNumber"/></el-form-item></el-col>
-    <el-col :span="12"><el-form-item label-width="140px" label="安全生产标准化等级" prop="safetyLevel"><el-select :disabled="dc.mode !== 'add' && dc.mode !== 'modify'" v-model="dc.data.safetyLevel" clearable><el-option v-for="item in DICTITEMS.AQSBFZDJ_OPTIONS" :key="item.value" :label="item.label" :value="item.value"></el-option></el-select></el-form-item></el-col>
-    <el-col :span="12"><el-form-item label="发证机关" prop="issuingAuthority"><el-input :disabled="dc.mode !== 'add' && dc.mode !== 'modify'" v-model="dc.data.issuingAuthority"/></el-form-item></el-col>
-    <el-col :span="12"><el-form-item label-width="130px" label="标准化证书有效期" prop="certValidity"><el-date-picker :disabled="dc.mode !== 'add' && dc.mode !== 'modify'" v-model="dc.data.certValidity" style="width: 100%;" type="date" value-format="YYYY-MM-DD" placeholder="选择日期"/></el-form-item></el-col>
-    <el-col :span="12"><el-form-item label-width="100px" label="从业人员数量" prop="employeeCount"><el-input :disabled="dc.mode !== 'add' && dc.mode !== 'modify'" v-model="dc.data.employeeCount"/></el-form-item></el-col>
-    <el-col :span="12"><el-form-item label-width="120px" label="是否为培训机构" prop="isTraining"><el-radio-group :disabled="dc.mode !== 'add' && dc.mode !== 'modify'" v-model="dc.data.isTraining"><el-radio v-for="item in DICTITEMS.SF_OPTIONS" :key="item.value" :label="item.value">{{ item.label }}</el-radio></el-radio-group></el-form-item></el-col>
-  </el-row>
+     </el-row>
 </template>
 
 <script setup>
diff --git a/server/src/main/java/com/aisino/iles/core/model/LoginLog.java b/server/src/main/java/com/aisino/iles/core/model/LoginLog.java
index 05596ec..70444df 100644
--- a/server/src/main/java/com/aisino/iles/core/model/LoginLog.java
+++ b/server/src/main/java/com/aisino/iles/core/model/LoginLog.java
@@ -15,7 +15,6 @@ import java.time.LocalDateTime;
 @Table(name = "sys_login_log", indexes = {@Index(name = "idx_lglog_sid", columnList = "sessionId")})
 @Data
 @EqualsAndHashCode(of = {"loginLogId"})
-@Builder
 @NoArgsConstructor
 @AllArgsConstructor
 public class LoginLog {
diff --git a/server/src/main/java/com/aisino/iles/core/util/TokenUtil.java b/server/src/main/java/com/aisino/iles/core/util/TokenUtil.java
index ee2295d..1da78f0 100644
--- a/server/src/main/java/com/aisino/iles/core/util/TokenUtil.java
+++ b/server/src/main/java/com/aisino/iles/core/util/TokenUtil.java
@@ -101,6 +101,7 @@ public class TokenUtil {
         return Optional.empty();
     }
 
+
     public static String signFrom(String token) {
         return Optional.ofNullable(token)
                 .map(StrUtil::trimToNull)