文字修改

xuhongjie
许宏杰 1 month ago
parent 53b14b7ff3
commit a64c6224ad

@ -1,6 +1,6 @@
{
"name": "ruoyi",
"version": "1.0.202504021009",
"version": "1.0.202506251717",
"description": "金鸡湖现代服务业品牌管理系统",
"author": "若依",
"license": "MIT",

@ -43,8 +43,8 @@ export const constantRoutes = [
},
{
path: "/login",
component: () => import("@/views/login"), // 测试环境登录页
// component: () => import("@/views/login_v1"), // 正式环境登录页
// component: () => import("@/views/login"), // 测试环境登录页
component: () => import("@/views/login_v1"), // 正式环境登录页
hidden: true,
},
{

@ -1,6 +1,6 @@
<template>
<el-dialog
title="荣誉情况"
title="荣誉情况"
:visible.sync="infoVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
@ -11,12 +11,12 @@
>
<div>
<section>
<el-table
v-loading="loading"
<el-table
v-loading="loading"
border
class="dataMap-two-table"
:data="tableData"
:cell-class-name="tableRowClassName"
class="dataMap-two-table"
:data="tableData"
:cell-class-name="tableRowClassName"
:cell-style="tableCellStyle"
:header-cell-style="{background:'#D1D9E6'}"
:span-method="objectSpanMethod"
@ -40,7 +40,7 @@
<div class="project-trace-table-number" :class="scope.row.count3 == '-' ? 'grey-number' : ''" @click="smallNumber(scope.row)">{{ scope.row.count3 }}</div>
</template>
</el-table-column>
<el-table-column label="2024年新增" prop="currentYearAdd" align="center" width="100">
<el-table-column label="2025年新增" prop="currentYearAdd" align="center" width="100">
<template slot-scope="scope">
<div class="project-trace-table-number" :class="scope.row.currentYearAdd == '-' ? 'grey-number' : ''" @click="YrarNumber(scope.row)">{{ scope.row.currentYearAdd }}</div>
</template>
@ -68,7 +68,7 @@ export default {
projectBigName: ['projectMiddleName'], //
//
projectSmallName: [], //
projectBigName: [] //
projectBigName: [] //
};
this.setTabelRowSpan(this.tableData, ['projectBigName', 'count1', 'projectMiddleName', 'count2', 'projectSmallName', 'count3', 'currentYearAdd'], effectMerge);
},

@ -329,7 +329,7 @@ export default {
dicts: ["project_small_type"],
data() {
return {
firstMonthOfYear:moment().startOf('year').format('YYYY-MM'),
firstMonthOfYear:"2025-06",
activeIndex:1,
options1: [
{

Loading…
Cancel
Save