Compare commits

3 Commits
main ... prod

Author SHA1 Message Date
tianyongbao
925d65d47f fix: 测试问题,统一修复。 2026-05-30 16:43:28 +08:00
tianyongbao
3a3d75e3b3 fix: 修改图标显示问题。 2026-04-15 17:13:19 +08:00
tianyongbao
0a46f1a36e fix: 用户昵称改成公司名称。 2026-04-14 22:52:01 +08:00
4 changed files with 30 additions and 11 deletions

View File

@@ -56,9 +56,9 @@
<el-table v-loading="loading" :data="sharingRecordList" :header-cell-style="{ 'text-align': 'center' }"> <el-table v-loading="loading" :data="sharingRecordList" :header-cell-style="{ 'text-align': 'center' }">
<el-table-column label="记录标题" align="center" prop="title" width="180"> <el-table-column label="记录标题" align="center" prop="title" width="180" show-overflow-tooltip="false">
<template #default="scope"> <template #default="scope">
<ellipsis :value="scope.row.title" :length="15"></ellipsis> <span class="title-wrap">{{ scope.row.title }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="分润金额(元)" align="center" prop="amount" /> <el-table-column label="分润金额(元)" align="center" prop="amount" />
@@ -229,4 +229,12 @@ getAlertInfo()
.alertInfo{ .alertInfo{
margin-bottom: 20px; margin-bottom: 20px;
} }
.title-wrap {
display: inline-block;
width: 100%;
white-space: normal;
word-break: break-all;
line-height: 1.5;
}
</style> </style>

View File

@@ -82,9 +82,9 @@ const setOption = (title, datas, feilds) => {
const data = param[0].data.slice(-defaultLength) const data = param[0].data.slice(-defaultLength)
param.forEach((axis, index) => { param.forEach((axis, index) => {
if (index === 0) { if (index === 0) {
tooltipMsg.push(`${axis.axisValueLabel}<br/>${axis.marker}${axis.seriesName}${data[index]}${props.suffix}`) tooltipMsg.push(`${axis.axisValueLabel}<br/>${axis.marker}${props.title}${data[index]}${props.suffix}`)
} else { } else {
tooltipMsg.push(`<br/>${axis.marker}${axis.seriesName}${data[index] === null ? "-" : data[index] + props.suffix}`) tooltipMsg.push(`<br/>${axis.marker}${props.title}${data[index] === null ? "-" : data[index] + props.suffix}`)
} }
}) })
return tooltipMsg.join("") return tooltipMsg.join("")

View File

@@ -41,12 +41,23 @@
<el-table-column label="小程序用户名" align="center" prop="appUserName" /> <el-table-column label="小程序用户名" align="center" prop="appUserName" />
<el-table-column label="客户手机号" align="center" prop="appUserTel" /> <el-table-column label="客户手机号" align="center" prop="appUserTel" />
<el-table-column label="绑定用户" align="center" prop="userName" /> <el-table-column label="绑定用户" align="center" prop="userName" />
<el-table-column label="备注" align="center" prop="remark" width="120"> <!-- <el-table-column label="备注" align="center" prop="remark" width="120">
<template #default="scope"> <template #default="scope">
<ellipsis :value="scope.row.remark" :length="12"></ellipsis> <ellipsis :value="scope.row.remark" :length="12"></ellipsis>
</template> </template>
</el-table-column> -->
<el-table-column label="添加人" align="center" prop="createBy" />
<el-table-column label="添加时间" align="center" prop="createTime" width="160">
<template #default="scope">
<span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d} {h}:{i}:{s}") }}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width"> <el-table-column label="更新时间" align="center" prop="updateTime" width="160">
<template #default="scope">
<span>{{ parseTime(scope.row.updateTime, "{y}-{m}-{d} {h}:{i}:{s}") }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width" fixed="right">
<template #default="scope"> <template #default="scope">
<el-button link type="primary" icon="Wallet" @click="handleDeviceData(scope.row)">设备数据</el-button> <el-button link type="primary" icon="Wallet" @click="handleDeviceData(scope.row)">设备数据</el-button>
<el-button link type="primary" icon="Tickets" @click="handleAlarmList(scope.row)">告警记录</el-button> <el-button link type="primary" icon="Tickets" @click="handleAlarmList(scope.row)">告警记录</el-button>

View File

@@ -69,7 +69,7 @@
<el-table-column type="selection" width="50" align="center" /> <el-table-column type="selection" width="50" align="center" />
<el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" /> <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
<el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" /> <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
<el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" /> <el-table-column label="公司名称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
<el-table-column label="所属上级" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" /> <el-table-column label="所属上级" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
<el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" /> <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
<el-table-column label="状态" align="center" key="status" v-if="columns[5].visible"> <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
@@ -113,8 +113,8 @@
<el-form :model="form" :rules="rules" ref="userRef" label-width="80px"> <el-form :model="form" :rules="rules" ref="userRef" label-width="80px">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="用户昵称" prop="nickName"> <el-form-item label="公司名称" prop="nickName">
<el-input v-model="form.nickName" placeholder="请输入用户昵称" maxlength="30" /> <el-input v-model="form.nickName" placeholder="请输入公司名称" maxlength="30" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@@ -286,7 +286,7 @@ const upload = reactive({
const columns = ref([ const columns = ref([
{ key: 0, label: `用户编号`, visible: true }, { key: 0, label: `用户编号`, visible: true },
{ key: 1, label: `用户名称`, visible: true }, { key: 1, label: `用户名称`, visible: true },
{ key: 2, label: `用户昵`, visible: true }, { key: 2, label: `公司名`, visible: true },
{ key: 3, label: `部门`, visible: true }, { key: 3, label: `部门`, visible: true },
{ key: 4, label: `手机号码`, visible: true }, { key: 4, label: `手机号码`, visible: true },
{ key: 5, label: `状态`, visible: true }, { key: 5, label: `状态`, visible: true },
@@ -308,7 +308,7 @@ const data = reactive({
{ required: true, message: "用户名称不能为空", trigger: "blur" }, { required: true, message: "用户名称不能为空", trigger: "blur" },
{ min: 2, max: 20, message: "用户名称长度必须介于 2 和 20 之间", trigger: "blur" }, { min: 2, max: 20, message: "用户名称长度必须介于 2 和 20 之间", trigger: "blur" },
], ],
nickName: [{ required: true, message: "用户昵称不能为空", trigger: "blur" }], nickName: [{ required: true, message: "公司名称不能为空", trigger: "blur" }],
roleIds: [{ required: true, message: "角色不能为空", trigger: "change" }], roleIds: [{ required: true, message: "角色不能为空", trigger: "change" }],
deptId: [{ required: true, message: "归属部门不能为空", trigger: "change" }], deptId: [{ required: true, message: "归属部门不能为空", trigger: "change" }],
password: [ password: [