jiangzongtao
/
zhzf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

完善企业类型，excel模版中增加企业分类

This commit is contained in:
chenlinlin 2025-08-29 20:03:23 +08:00
parent 2c2f5019e3
commit 88f1335bed
5 changed files with 4 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/router/index.js
View File

@ -57,7 +57,7 @@ const baseRoutes = [
], ],
}, },
{ {
path: '/jbts/login',
name: '_jbts_login', name: '_jbts_login',
component: () => import('@views/jbts/login.vue'), component: () => import('@views/jbts/login.vue'),
meta: { meta: {

2
client/src/views/big-screen/bigdata.vue
View File

@ -2541,7 +2541,7 @@ const login = async () => {
let password = CryptoJS.MD5('Pe26957381').toString() let password = CryptoJS.MD5('Pe26957381').toString()
let param = {username: username, password: password} let param = {username: username, password: password}
let jsonString = JSON.stringify(param) let jsonString = JSON.stringify(param)
let urlEncodedString = encodeURIComponent(jsonString)
let login_info = btoa(urlEncodedString) let login_info = btoa(urlEncodedString)
try { try {
const response = await axios.post('/rest/index/login/login', {login_info: login_info}) const response = await axios.post('/rest/index/login/login', {login_info: login_info})

21
client/src/views/dtsjygl/enterprise/qyjbxx.vue
View File

@ -29,26 +29,7 @@
<el-col :span="24" style="border-top: 1px solid #ebeef5; border-bottom: 1px solid #ebeef5; margin-bottom: 10px;"> <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> <div style="text-align: center; font-size: 16px; font-weight: 600; width: 100%; padding: 8px 0;">以下为一般指标项：（选填）</div>
</el-col> </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-row>
<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>
</template> </template>
<script setup> <script setup>

1
server/src/main/java/com/aisino/iles/core/model/LoginLog.java
View File

@ -15,7 +15,6 @@ import java.time.LocalDateTime;
@Table(name = "sys_login_log", indexes = {@Index(name = "idx_lglog_sid", columnList = "sessionId")}) @Table(name = "sys_login_log", indexes = {@Index(name = "idx_lglog_sid", columnList = "sessionId")})
@Data @Data
@EqualsAndHashCode(of = {"loginLogId"}) @EqualsAndHashCode(of = {"loginLogId"})
@Builder
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
public class LoginLog { public class LoginLog {

1
server/src/main/java/com/aisino/iles/core/util/TokenUtil.java
View File

@ -101,6 +101,7 @@ public class TokenUtil {
return Optional.empty(); return Optional.empty();
} }
public static String signFrom(String token) { public static String signFrom(String token) {
return Optional.ofNullable(token) return Optional.ofNullable(token)
.map(StrUtil::trimToNull) .map(StrUtil::trimToNull)