12 Commits
Author SHA1 Message Date
lianlonggang 2241b6873f fix(healthMonitor): 修复健康监测模块中的组织机构数据显示和绑定功能
- 在sectoralData.data.ts中添加单位名称列的颜色渲染,三级单位显示为红色
- 在sectoralDataList.vue中添加组织代码长度限制,小于6位时禁用明细和导出功能
- 修复toolManagement组件中bindModal.vue的参数传递问题
- 修改toolManagement.data.ts中部门选择器的默认值和禁用状态
- 移除重复的单位名称表单项并优化搜索表单的组织机构选择逻辑
- 添加单位名称列到员工表格中并调整搜索表单的字段映射
2026-05-06 15:04:28 +08:00
lianlonggang eeb1496483 feat(upload): 配置文件上传组件的业务路径和文本提示
- 在 JImageUpload 组件中添加 bizPath 属性以指定上传路径
- 为头像上传功能统一设置 bizPath: 'avatar'
- 为图片上传功能设置 bizPath: 'img'
- 为视频上传功能设置 bizPath: 'video'
- 为PDF文件上传设置 bizPath: 'bizfile'
- 为APP文件上传设置 bizPath: 'appfile'
- 添加 text 属性统一显示 '上传头像' 提示文本
- 在系统横幅管理中配置图片上传的业务路径
- 为新资源管理模块添加完整的数据结构定义
2026-04-30 08:56:14 +08:00
lianlonggang 3da41ae2d3 fix(emergency): 解决消息解析异常问题
- 添加了对消息数据的类型检查
- 添加了JSON解析的异常捕获处理
- 防止非字符串数据导致的解析错误
- 确保消息处理的健壮性
2026-04-10 14:43:29 +08:00
lianlonggang 7106e99a7b fix(chat): 修复消息气泡组件头像加载及位置服务地图链接
- 实现头像加载失败处理机制,添加默认头像回退方案
- 使用 ref 状态追踪头像加载失败情况,避免 watchEffect 重置问题
- 更新位置服务地图链接,从腾讯地图切换到高德地图服务
- 配置 Vue 构建依赖转译,解决 element-plus 兼容性问题
- 移除多个无用的 SVG 图标文件,精简项目资源
2026-04-10 14:43:08 +08:00
lianlonggang c1a56aefd9 style(UserSelectByDepModal): 优化部门选择用户弹窗样式
- 将左侧部门树卡片的 minHeight 改为固定 height: 613px
- 将 overflow: auto 改为 overflowY: auto,避免横向滚动条
2026-04-01 15:31:19 +08:00
lianlonggang 4f848e7ce9 fix(emergency,healthMonitor): 修复通知消息弹窗重复提交问题并优化页面细节
- 为通知消息弹窗的\"保存并发送\"和\"保存\"按钮添加 loading 状态和 disabled 禁用,防止重复提交
- 优化应急管理列表页面和 AED 设备地图页面的代码格式
2026-04-01 14:48:34 +08:00
lianlonggang a9db38e5e1 修复手表数据日历展示问题,屏蔽非当前月的日期,切换日期发生年份变化时获取新年份月数据 2026-03-30 18:53:07 +08:00
weixin 80627d24c0 update 2026-03-24 10:14:26 +08:00
weixin a24c936cde update
1.修改健康银行访问链接,测试环境截取掉:+端口
2026-03-24 10:03:33 +08:00
weixin 5db0c7effc update
1.修改健康银行访问链接
2026-03-24 09:21:27 +08:00
weixin 28707b346e update
1.修改员工工号正则,emp_sysno为EMP_SYSNO
2026-03-19 16:09:23 +08:00
lianlonggang 8eff9119c7 信创改造,处理写死的表名 2026-03-16 17:37:48 +08:00
41 changed files with 237 additions and 207 deletions
@@ -6,8 +6,7 @@
<!-- onerror="this.src='https://web.sdk.qcloud.com/component/TUIKit/assets/avatar_21.png'"-->
<!-- alt=""-->
<!-- />-->
<img class="avatar" v-if="getSrc(message)" :src="getSrc(message)" alt="" />
<img class="avatar" v-else src="@/assets/image/default_avatar.png" alt="" />
<img class="avatar" :src="avatarError ? defaultAvatar : (message?.avatar || defaultAvatar)" @error="onAvatarError" alt="" />
<main class="message-area">
<label class="name" v-if="message.flow === 'in' && message.conversationType === 'GROUP'">
{{ message.nameCard || message.nick || message.from }}
@@ -86,6 +85,7 @@
import MessageReference from './message-reference.vue';
import { Message } from '../interface';
import { TUIEnv } from '../../../../../TUIKit/TUIPlugin';
import defaultAvatar from '@/assets/image/default_avatar.png';
import MessageEmojiReact from './message-emoji-react.vue';
import TIM from '../../../../TUICore/tim/index';
@@ -145,6 +145,15 @@
needEmojiReact: false,
});
// 追踪头像加载失败状态,避免 watchEffect 重置时覆盖 @error 的修复
const avatarError = ref(false);
watch(() => (props.data as any)?.ID, () => {
avatarError.value = false;
});
const onAvatarError = () => {
avatarError.value = true;
};
watchEffect(() => {
data.type = constant;
data.messagesList = props.messagesList;
@@ -376,6 +385,9 @@
return {
getSrc,
defaultAvatar,
avatarError,
onAvatarError,
...toRefs(data),
toggleDialog,
htmlRefHook,
+1
View File
@@ -9,6 +9,7 @@ module.exports = {
outputDir: '../public/static/im-web',
productionSourceMap: false,
lintOnSave: false,
transpileDependencies: ['element-plus', 'vue-router', '@ctrl/tinycolor'],
chainWebpack: (config) => {
config.resolve.alias.set('@', resolve('src')).set('tim', resolve('src/tim.js'));
// 删除预加载
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+2 -2
View File
@@ -1,4 +1,4 @@
<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0"><link rel="icon" href="faviconnew.png"><title>即时通信</title><link href="css/vendors~app.03806786.css" rel="stylesheet"><link href="css/app.12928813.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but 腾讯云即时通信 Web-IM doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="./TCaptcha.js"></script><script src="./aegis.min.js"></script><script>/**
<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0"><link rel="icon" href="faviconnew.png"><title>即时通信</title><link href="css/vendors~app.28a73048.css" rel="stylesheet"><link href="css/app.7113887a.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but 腾讯云即时通信 Web-IM doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="./TCaptcha.js"></script><script src="./aegis.min.js"></script><script>/**
* 根据基础字体大小 和 效果图宽度设置 根节点字体大小
* @param baseFontSize 浏览器默认字体大小 [注]浏览器最小字体为12像素,所以该值必需大于等于12
* @param baseWidth 设计稿的尺寸
@@ -53,4 +53,4 @@
},
false
);
};</script><script src="js/vendors~app.de88239f.js"></script><script src="js/app.0cb3a231.js"></script></body></html>
};</script><script src="js/vendors~app.b38bf4ff.js"></script><script src="js/app.2f662ea4.js"></script></body></html>
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -3,7 +3,7 @@
<BasicModal v-bind="$attrs" @register="register" :title="modalTitle" width="1200px" @ok="handleOk" destroyOnClose @visible-change="visibleChange">
<a-row :gutter="10">
<a-col :md="7" :sm="24">
<a-card :style="{ minHeight: '613px', overflow: 'auto' }">
<a-card :style="{ height: '613px', overflowY: 'auto' }">
<!--组织机构-->
<BasicTree
ref="treeRef"
+2 -3
View File
@@ -45,7 +45,6 @@
import { getToken } from '/@/utils/auth';
import { useLoading } from '/@/components/Loading';
import { useGlobSetting } from '/@/hooks/setting';
import qs from 'qs';
const { viteOutUrl, apiUrl } = useGlobSetting();
export default defineComponent({
@@ -135,14 +134,14 @@
.get({
url: '/health-system/api/sys/encryptInfo',
params: {
str: qs.stringify({
str: {
scheme: apiUrl.split('://')[0],
host:
apiUrl.split('://')[1].indexOf(':') !== -1
? apiUrl.split('://')[1].substring(0, apiUrl.split('://')[1].indexOf(':'))
: apiUrl.split('://')[1],
tokenF: getToken(),
}),
},
},
})
.then((res) => {
+1 -1
View File
@@ -20,7 +20,7 @@
fontSize: props.size ?? '30px',
opacity: 0.5,
transition: 'opacity 0.5s',
display: 'none',
display: 'block',
});
const bodyStyle = ref({
@@ -102,6 +102,7 @@ export const formSchema: FormSchema[] = [
field: 'image',
component: 'JImageUpload',
componentProps: {
bizPath: 'img',
fileMax: 1,
},
},
@@ -266,6 +266,8 @@ export const formSchema: FormSchema[] = [
component: 'JImageUpload',
// rules: [{ required: true, message: '请选择头像' }],
componentProps: {
text: '上传头像',
bizPath: 'avatar',
//@ts-ignore
maxCount: 1,
},
@@ -190,6 +190,8 @@ export const formSchema: FormSchema[] = [
label: '头像',
component: 'JImageUpload',
componentProps: {
text: '上传头像',
bizPath: 'avatar',
// @ts-ignore
maxCount: 1,
},
@@ -169,6 +169,7 @@ export const formSchema: FormSchema[] = [
field: 'img',
component: 'JImageUpload',
componentProps: {
bizPath: 'img',
fileMax: 1,
},
rules: [{ required: false }],
+12 -1
View File
@@ -40,7 +40,7 @@
/>
<div class="bottom-top">
<div class="top-title"> <img :src="aedP" alt="" /> {{ showWindowInfo?.name }} </div>
<div class="top-title-bottom"> 距离{{ showWindowInfo?.dis ? showWindowInfo?.dis : 0 }}m </div>
<div class="top-title-bottom"> 距离{{ formatDistance(showWindowInfo?.dis) }} </div>
<div class="top-title-describe"> {{ showWindowInfo?.installAddress ? showWindowInfo?.installAddress : '无' }} </div>
<div class="table-list">
<div class="label-d"> 设备厂家 </div>
@@ -411,6 +411,17 @@
window.open(getFileAccessHttpUrl(v), '_blank');
}
/**
* 格式化距离:超过1000米换算为千米,保留两位小数
*/
function formatDistance(dis) {
if (!dis) return '0m';
if (dis >= 1000) {
return (dis / 1000).toFixed(2) + 'km';
}
return dis + 'm';
}
function getName(val, list) {
if (!val && val !== 0) return '';
for (let i = 0; i < list.length; i++) {
@@ -306,6 +306,7 @@ export const getFormSchema = () => {
component: 'JUpload',
componentProps: () => {
return {
bizPath: 'video',
maxCount: 1,
accept: '.mp4,video/mp4',
tipText: '支持MP4格式,最大200M',
@@ -319,6 +320,7 @@ export const getFormSchema = () => {
component: 'JUpload',
componentProps: () => {
return {
bizPath: 'bizfile',
maxCount: 1,
accept: 'application/pdf',
tipText: '仅支持PDF格式文件,最大200M',
@@ -212,17 +212,17 @@
const [registerTable, { reload, getForm, getDataSource, setTableData }] = tableContext;
</script>
<style scoped lang="less">
:deep(.ant-table-cell-fix-left, .ant-table-cell-fix-right) {
position: relative;
border-bottom: none !important;
&:after {
position: absolute;
content: '';
width: 100%;
top: 0;
left: 0;
border-bottom: 1px solid #f0f0f0;
}
}
//:deep(.ant-table-cell-fix-left, .ant-table-cell-fix-right) {
// position: relative;
// //border-bottom: none !important;
// border-bottom: 2px solid #f0f0f0 !important;
// &:after {
// position: absolute;
// content: '';
// width: 100%;
// top: 0;
// left: 0;
// border-bottom: 1px solid #f0f0f0;
// }
//}
</style>
+7 -1
View File
@@ -172,7 +172,13 @@
loadingVisible.value = false;
};
window.onmessage = async (msg) => {
const result = JSON.parse(msg.data);
if (!msg.data || typeof msg.data !== 'string') return;
let result: any;
try {
result = JSON.parse(msg.data);
} catch (e) {
return;
}
switch (result.code) {
case 'closeLoading':
closeLoading();
@@ -141,6 +141,8 @@ export const formSchema = function (showGoodAt: boolean): FormSchema[] {
component: 'JImageUpload',
required: true,
componentProps: () => ({
text: '上传头像',
bizPath: 'avatar',
maxCount: 1,
}),
},
@@ -8,7 +8,7 @@
</template>
</BasicTable>
</template>
<script setup lang="ts" name="bindRecords-name">
<script setup lang="ts">
import BasicTable from '/@/components/Table/src/BasicTable.vue';
import { useListPage } from '/@/hooks/system/useListPage';
import { bindRecordColumns, bindRecordSchema } from '/@/views/healthMonitor/healMonitorManage/monitorToll/bindRecords/bindRecords.data';
@@ -7,8 +7,8 @@
</BasicForm>
<template #footer v-if="title !== '查看'">
<a-button @click="handleCanel">取消</a-button>
<a-button type="primary" @click="handleSubmit(1)">保存并发送</a-button>
<a-button type="primary" @click="handleSubmit(2)">保存</a-button>
<a-button type="primary" :loading="submitting" :disabled="submitting" @click="handleSubmit(1)">保存并发送</a-button>
<a-button type="primary" :loading="submitting" :disabled="submitting" @click="handleSubmit(2)">保存</a-button>
</template>
</BasicModal>
<ChooseSome
@@ -35,6 +35,7 @@
// Emits声明
const emit = defineEmits(['register', 'success', 'userData']);
const isUpdate = ref(true);
const submitting = ref(false);
const [examinationModal, { openDrawer }] = useDrawer();
//设置标题
const title = ref(String);
@@ -100,6 +101,7 @@
//表单提交事件
async function handleSubmit(type: number) {
try {
submitting.value = true;
let values = await validate();
setModalProps({ confirmLoading: true });
//提交表单
@@ -109,6 +111,7 @@
//刷新列表
emit('success');
} finally {
submitting.value = false;
setModalProps({ confirmLoading: false });
}
}
@@ -19,7 +19,7 @@
<notification-news-modal @register="registerModal" @success="handleSuccess" />
</div>
</template>
<script setup lang="ts" name="healthMonitor-notificationNews">
<script setup lang="ts">
import { BasicTable, TableAction } from '/@/components/Table';
import { useListPage } from '/@/hooks/system/useListPage';
import { list, deleteOne, batchDelete, queryByID, reSend } from './notificationNews.api';
@@ -218,9 +218,9 @@
</style>
<style>
/* 隐藏日历面板中非当前月份的日期格,仅对该 picker 生效 */
.personal-data-no-other-month .ant-picker-cell:not(.ant-picker-cell-in-view) {
visibility: hidden;
pointer-events: none;
}
/* 隐藏日历面板中非当前月份的日期格,仅对该 picker 生效 */
.personal-data-no-other-month .ant-picker-cell:not(.ant-picker-cell-in-view) {
visibility: hidden;
pointer-events: none;
}
</style>
@@ -156,39 +156,13 @@ export const columnsNew: BasicColumn[] = [
},
},
{
title: '分配设备数',
title: '分配设备数',
dataIndex: ['assignedDeviceNums'],
customRender: ({ text }) => {
if (!text) return 0;
return text;
},
},
{
title: '未分配设备数',
dataIndex: 'unassignedDeviceNums',
customRender: ({ record }) => {
const total = record.totalAssignedDeviceNums ?? 0;
const assigned = record.assignedDeviceNums ?? 0;
return total - assigned;
},
},
{
title: '已绑定设备数',
dataIndex: ['assignedDeviceNums'],
customRender: ({ text }) => {
if (!text) return 0;
return text;
},
},
{
title: '未绑定设备数',
dataIndex: 'unassignedDeviceNums',
customRender: ({ record }) => {
const total = record.totalAssignedDeviceNums ?? 0;
const assigned = record.assignedDeviceNums ?? 0;
return total - assigned;
},
},
{
title: '佩戴人员数',
dataIndex: ['assignedUserNums'],
@@ -168,30 +168,32 @@
let xArr: any[] = [];
let yArr: any[] = [];
res.timePeriods &&
res.timePeriods.forEach((item) => {
res.timePeriods.map((item) => {
switch (item.flag) {
case 1:
// 浅睡
yArr.push(1, 1, null);
yArr.push(1);
yArr.push(1);
break;
case 3:
// 深睡
yArr.push(0, 0, null);
yArr.push(0);
yArr.push(0);
break;
case 4:
// 清醒
yArr.push(3, 3, null);
yArr.push(3);
yArr.push(3);
break;
case 5:
// 零星小睡
yArr.push(2, 2, null);
yArr.push(2);
yArr.push(2);
break;
}
xArr.push(dayjs(item.start).format('HH:mm'), dayjs(item.end).format('HH:mm'), '');
xArr.push(dayjs(item.start).format('HH:mm'));
xArr.push(dayjs(item.end).format('HH:mm'));
});
// 去掉最后多余的 null
if (yArr.length > 0) yArr.pop();
if (xArr.length > 0) xArr.pop();
const option = {
xAxis: {
type: 'category',
@@ -8,7 +8,7 @@
<user-info-modal @register="registerModal" />
</div>
</template>
<script setup lang="ts" name="userInfoList-name">
<script setup lang="ts">
import BasicTable from '/@/components/Table/src/BasicTable.vue';
import { useListPage } from '/@/hooks/system/useListPage';
import { columns, searchSchema } from '/@/views/healthMonitor/healMonitorManage/monitorToll/userInfo/userInfo.data';
+1 -1
View File
@@ -73,7 +73,7 @@ export const formSchema: FormSchema[] = [
dynamicDisabled: ({ values }) => {
return !!values.id;
},
dynamicRules: ({ model, schema }) => rules.duplicateCheckRule('sys_dict', 'dict_code', model, schema, true),
dynamicRules: ({ model, schema }) => rules.duplicateCheckRule('QH_SYS_DICT', 'dict_code', model, schema, true),
},
{
label: '描述',
@@ -77,7 +77,7 @@ export const formSchemas: FormSchema[] = [
field: 'templateCode',
component: 'Input',
dynamicRules: ({ model, schema }) => {
return [...rules.duplicateCheckRule('sys_sms_template', 'template_code', model, schema, true)];
return [...rules.duplicateCheckRule('QH_SYS_SMS_TEMPLATE', 'template_code', model, schema, true)];
},
// 编辑模式下不可修改编码
dynamicDisabled: (params) => !!params.values.id,
@@ -74,6 +74,8 @@ export const searchFormSchema: FormSchema[] = [
},
];
//表单数据
// @ts-ignore
// @ts-ignore
export const formSchema: FormSchema[] = [
{
label: '序号',
@@ -91,6 +93,10 @@ export const formSchema: FormSchema[] = [
label: '图片',
field: 'photoUrl',
component: 'JImageUpload',
componentProps: {
bizPath: 'img',
maxCount: 1,
},
rules: [{ required: true, message: '请上传图片' }],
},
{
@@ -311,7 +311,7 @@ export const formSchema: (isUpdate: boolean) => FormSchema[] = (isUpdate) => {
};
},
dynamicRules: ({ model, schema }) => {
let rule = rules.duplicateCheckRuleAndDelFlag('health_user_employee_ex', 'emp_sysno', 'false', model, schema, false);
let rule = rules.duplicateCheckRuleAndDelFlag('QH_HLT_USER_EMPLOYEE_EX', 'EMP_SYSNO', 'false', model, schema, false);
rule[0] = { ...rule[0], required: false };
return rule;
},
@@ -330,6 +330,8 @@ export const formSchema: (isUpdate: boolean) => FormSchema[] = (isUpdate) => {
field: 'avatar',
component: 'JImageUpload',
componentProps: {
text: '上传头像',
bizPath: 'avatar',
maxCount: 1,
},
},
@@ -207,6 +207,8 @@ export const formSchema: FormSchema[] = [
label: '头像',
component: 'JImageUpload',
componentProps: {
text: '上传头像',
bizPath: 'avatar',
maxCount: 1,
},
},
@@ -141,6 +141,8 @@ export const formSchema = function (showGoodAt: boolean): FormSchema[] {
component: 'JImageUpload',
required: true,
componentProps: () => ({
text: '上传头像',
bizPath: 'avatar',
maxCount: 1,
}),
},
+4 -4
View File
@@ -219,7 +219,7 @@ export const formSchema: FormSchema[] = [
},
dynamicRules: ({ model, schema }) => {
if (model.id) {
return rules.duplicateCheckRule('sys_user', 'username', model, schema, true);
return rules.duplicateCheckRule('QH_SYS_USER', 'username', model, schema, true);
} else {
return Promise.resolve();
}
@@ -266,7 +266,7 @@ export const formSchema: FormSchema[] = [
field: 'workNo',
required: true,
component: 'Input',
dynamicRules: ({ model, schema }) => rules.duplicateCheckRule('sys_user', 'work_no', model, schema, true),
dynamicRules: ({ model, schema }) => rules.duplicateCheckRule('QH_SYS_USER', 'work_no', model, schema, true),
},
{
label: '职务',
@@ -379,7 +379,7 @@ export const formSchema: FormSchema[] = [
field: 'email',
component: 'Input',
dynamicRules: ({ model, schema }) => {
return [{ ...rules.duplicateCheckRule('sys_user', 'email', model, schema, true)[0] }, { ...rules.rule('email', false)[0] }];
return [{ ...rules.duplicateCheckRule('QH_SYS_USER', 'email', model, schema, true)[0] }, { ...rules.rule('email', false)[0] }];
},
},
{
@@ -388,7 +388,7 @@ export const formSchema: FormSchema[] = [
component: 'Input',
dynamicRules: ({ model, schema }) => {
return [
{ ...rules.duplicateCheckRule('sys_user', 'phone', model, schema, true)[0] },
{ ...rules.duplicateCheckRule('QH_SYS_USER', 'phone', model, schema, true)[0] },
{ pattern: /^1[3456789]\d{9}$/, message: '手机号码格式有误' },
];
},
@@ -35,7 +35,7 @@
const validatorRules: Record<string, Rule[]> = {
email: [
{ ...rules.duplicateCheckRule('sys_user', 'email', formState, { label: '邮箱' })[0] },
{ ...rules.duplicateCheckRule('QH_SYS_USER', 'email', formState, { label: '邮箱' })[0] },
{ required: true, type: 'email', message: '邮箱格式不正确' },
],
};
@@ -40,7 +40,7 @@
const validatorRules: Record<string, Rule[]> = {
phone: [
{ ...rules.duplicateCheckRule('sys_user', 'phone', formState, { label: '手机号' })[0] },
{ ...rules.duplicateCheckRule('QH_SYS_USER', 'phone', formState, { label: '手机号' })[0] },
{ pattern: /^1[3456789]\d{9}$/, message: '手机号码格式有误' },
],
smscode: [{ required: true, message: '请输入验证码' }],
@@ -154,6 +154,7 @@ export const itemFormSchema: FormSchema[] = [
component: 'JUpload',
componentProps: () => {
return {
bizPath: 'appfile',
maxCount: 1,
};
},