renkang/xj-admin
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: renkang/xj-admin:0fa2e605a568da521944e934fd68fc3a67f78188
Branches Tags
renkang/xj-admin:master renkang/xj-admin:xc-new renkang/xj-admin:develop renkang/xj-admin:xc
..
compare: renkang/xj-admin:develop
Branches Tags
renkang/xj-admin:xc-new renkang/xj-admin:develop renkang/xj-admin:xc renkang/xj-admin:master
8 Commits
0fa2e605a5 .. develop
Author SHA1 Message Date
weixin 6c5c442928 fix(健康检测-用户数据): 睡眠折线图按阶段分段显示，各段间不再连续连线 
每段睡眠数据（深睡/浅睡/清醒/零星小睡）之间插入 null 断点，
ECharts 折线图在 null 处自动断开，使不同睡眠阶段呈现为独立线段。
 2026-06-30 16:39:25 +08:00
lianlonggang 2380e56266 fix(healthMonitor): 最后一次更新 2026-05-09 20:30:35 +08:00
lianlonggang fdce66d761 fix(healthMonitor): 修复健康监测模块中的组织机构数据显示和绑定功能 
- 在sectoralData.data.ts中添加单位名称列的颜色渲染，三级单位显示为红色
- 在sectoralDataList.vue中添加组织代码长度限制，小于6位时禁用明细和导出功能
- 修复toolManagement组件中bindModal.vue的参数传递问题
- 修改toolManagement.data.ts中部门选择器的默认值和禁用状态
- 移除重复的单位名称表单项并优化搜索表单的组织机构选择逻辑
- 添加单位名称列到员工表格中并调整搜索表单的字段映射
 2026-04-30 16:50:55 +08:00
weixin 34e1590382 update 
1.修改发送位置时，地图引用组件错误问题
 2026-04-10 09:43:35 +08:00
lianlonggang 7fea1a0d9f 修复手表数据日历展示问题，屏蔽非当前月的日期，切换日期发生年份变化时获取新年份月数据 2026-03-30 18:51:58 +08:00
weixin 8cf3ee079b update 2026-03-24 10:14:01 +08:00
weixin 388c6bdf4a update 
1.修改健康银行访问链接,测试环境截取掉:+端口
 2026-03-24 10:02:25 +08:00
weixin 6ca7141c5d update 
1.修改健康银行访问链接
 2026-03-24 09:22:41 +08:00
42 changed files with 290 additions and 411 deletions
Expand all files Collapse all files
iweb/src/TUIKit/TUIComponents/container/TUIChat/components/message-bubble.vue
+2 -14
View File
@@ -6,7 +6,8 @@
<!-- onerror="this.src='https://web.sdk.qcloud.com/component/TUIKit/assets/avatar_21.png'"--> <!-- onerror="this.src='https://web.sdk.qcloud.com/component/TUIKit/assets/avatar_21.png'"-->
<!-- alt=""--> <!-- alt=""-->
<!-- />--> <!-- />-->
<img class="avatar" :src="avatarError ? defaultAvatar : (message?.avatar || defaultAvatar)" @error="onAvatarError" alt="" /> <img class="avatar" v-if="getSrc(message)" :src="getSrc(message)" alt="" />
<img class="avatar" v-else src="@/assets/image/default_avatar.png" alt="" />
<main class="message-area"> <main class="message-area">
<label class="name" v-if="message.flow === 'in' && message.conversationType === 'GROUP'"> <label class="name" v-if="message.flow === 'in' && message.conversationType === 'GROUP'">
{{ message.nameCard || message.nick || message.from }} {{ message.nameCard || message.nick || message.from }}
@@ -85,7 +86,6 @@
import MessageReference from './message-reference.vue'; import MessageReference from './message-reference.vue';
import { Message } from '../interface'; import { Message } from '../interface';
import { TUIEnv } from '../../../../../TUIKit/TUIPlugin'; import { TUIEnv } from '../../../../../TUIKit/TUIPlugin';
import defaultAvatar from '@/assets/image/default_avatar.png';
import MessageEmojiReact from './message-emoji-react.vue'; import MessageEmojiReact from './message-emoji-react.vue';
import TIM from '../../../../TUICore/tim/index'; import TIM from '../../../../TUICore/tim/index';
@@ -145,15 +145,6 @@
needEmojiReact: false, needEmojiReact: false,
}); });
// 追踪头像加载失败状态，避免 watchEffect 重置时覆盖 @error 的修复
const avatarError = ref(false);
watch(() => (props.data as any)?.ID, () => {
avatarError.value = false;
});
const onAvatarError = () => {
avatarError.value = true;
};
watchEffect(() => { watchEffect(() => {
data.type = constant; data.type = constant;
data.messagesList = props.messagesList; data.messagesList = props.messagesList;
@@ -385,9 +376,6 @@
return { return {
getSrc, getSrc,
defaultAvatar,
avatarError,
onAvatarError,
...toRefs(data), ...toRefs(data),
toggleDialog, toggleDialog,
htmlRefHook, htmlRefHook,
iweb/vue.config.js
-1
View File
@@ -9,7 +9,6 @@ module.exports = {
outputDir: '../public/static/im-web', outputDir: '../public/static/im-web',
productionSourceMap: false, productionSourceMap: false,
lintOnSave: false, lintOnSave: false,
transpileDependencies: ['element-plus', 'vue-router', '@ctrl/tinycolor'],
chainWebpack: (config) => { chainWebpack: (config) => {
config.resolve.alias.set('@', resolve('src')).set('tim', resolve('src/tim.js')); config.resolve.alias.set('@', resolve('src')).set('tim', resolve('src/tim.js'));
// 删除预加载 // 删除预加载
public/static/im-web/css/app.12928813.css
+1
View File
File diff suppressed because one or more lines are too long
public/static/im-web/css/app.7113887a.css
-1
View File
File diff suppressed because one or more lines are too long
public/static/im-web/css/vendors~app.03806786.css
+1
View File
File diff suppressed because one or more lines are too long
public/static/im-web/css/vendors~app.28a73048.css
-1
View File
File diff suppressed because one or more lines are too long
public/static/im-web/index.html
+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.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>/** <!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>/**
* 根据基础字体大小 和 效果图宽度设置 根节点字体大小 * 根据基础字体大小 和 效果图宽度设置 根节点字体大小
* @param baseFontSize 浏览器默认字体大小 [注]浏览器最小字体为12像素，所以该值必需大于等于12 * @param baseFontSize 浏览器默认字体大小 [注]浏览器最小字体为12像素，所以该值必需大于等于12
* @param baseWidth 设计稿的尺寸 * @param baseWidth 设计稿的尺寸
@@ -53,4 +53,4 @@
}, },
false false
); );
};</script><script src="js/vendors~app.b38bf4ff.js"></script><script src="js/app.2f662ea4.js"></script></body></html> };</script><script src="js/vendors~app.de88239f.js"></script><script src="js/app.0cb3a231.js"></script></body></html>
public/static/im-web/js/about.65a4f40d.js
+1
View File
File diff suppressed because one or more lines are too long
public/static/im-web/js/about.81078d6b.js
-1
View File
File diff suppressed because one or more lines are too long
public/static/im-web/js/app.0cb3a231.js
+1
View File
File diff suppressed because one or more lines are too long
public/static/im-web/js/app.2f662ea4.js
-1
View File
File diff suppressed because one or more lines are too long
public/static/im-web/js/vendors~app.b38bf4ff.js → public/static/im-web/js/vendors~app.de88239f.js
+121 -120
View File
File diff suppressed because one or more lines are too long
src/components/Form/src/jeecg/components/modal/UserSelectByDepModal.vue
+1 -1
View File
@@ -3,7 +3,7 @@
<BasicModal v-bind="$attrs" @register="register" :title="modalTitle" width="1200px" @ok="handleOk" destroyOnClose @visible-change="visibleChange"> <BasicModal v-bind="$attrs" @register="register" :title="modalTitle" width="1200px" @ok="handleOk" destroyOnClose @visible-change="visibleChange">
<a-row :gutter="10"> <a-row :gutter="10">
<a-col :md="7" :sm="24"> <a-col :md="7" :sm="24">
<a-card :style="{ height: '613px', overflowY: 'auto' }"> <a-card :style="{ minHeight: '613px', overflow: 'auto' }">
<!--组织机构--> <!--组织机构-->
<BasicTree <BasicTree
ref="treeRef" ref="treeRef"
src/components/Menu/src/BasicMenu.vue
+3 -2
View File
@@ -45,6 +45,7 @@
import { getToken } from '/@/utils/auth'; import { getToken } from '/@/utils/auth';
import { useLoading } from '/@/components/Loading'; import { useLoading } from '/@/components/Loading';
import { useGlobSetting } from '/@/hooks/setting'; import { useGlobSetting } from '/@/hooks/setting';
import qs from 'qs';
const { viteOutUrl, apiUrl } = useGlobSetting(); const { viteOutUrl, apiUrl } = useGlobSetting();
export default defineComponent({ export default defineComponent({
@@ -134,14 +135,14 @@
.get({ .get({
url: '/health-system/api/sys/encryptInfo', url: '/health-system/api/sys/encryptInfo',
params: { params: {
str: { str: qs.stringify({
scheme: apiUrl.split('://')[0], scheme: apiUrl.split('://')[0],
host: host:
apiUrl.split('://')[1].indexOf(':') !== -1 apiUrl.split('://')[1].indexOf(':') !== -1
? apiUrl.split('://')[1].substring(0, apiUrl.split('://')[1].indexOf(':')) ? apiUrl.split('://')[1].substring(0, apiUrl.split('://')[1].indexOf(':'))
: apiUrl.split('://')[1], : apiUrl.split('://')[1],
tokenF: getToken(), tokenF: getToken(),
}, }),
}, },
}) })
.then((res) => { .then((res) => {
src/components/Video/VideoPreview.vue
+1 -1
View File
@@ -20,7 +20,7 @@
fontSize: props.size ?? '30px', fontSize: props.size ?? '30px',
opacity: 0.5, opacity: 0.5,
transition: 'opacity 0.5s', transition: 'opacity 0.5s',
display: 'block', display: 'none',
}); });
const bodyStyle = ref({ const bodyStyle = ref({
src/views/consult/department/ConDepartment.data.ts
-1
View File
@@ -102,7 +102,6 @@ export const formSchema: FormSchema[] = [
field: 'image', field: 'image',
component: 'JImageUpload', component: 'JImageUpload',
componentProps: { componentProps: {
bizPath: 'img',
fileMax: 1, fileMax: 1,
}, },
}, },
src/views/consult/doctor/message/conDoctor.data.ts
-2
View File
@@ -266,8 +266,6 @@ export const formSchema: FormSchema[] = [
component: 'JImageUpload', component: 'JImageUpload',
// rules: [{ required: true, message: '请选择头像' }], // rules: [{ required: true, message: '请选择头像' }],
componentProps: { componentProps: {
text: '上传头像',
bizPath: 'avatar',
//@ts-ignore //@ts-ignore
maxCount: 1, maxCount: 1,
}, },
src/views/consult/helper/conHelper.data.ts
-2
View File
@@ -190,8 +190,6 @@ export const formSchema: FormSchema[] = [
label: '头像', label: '头像',
component: 'JImageUpload', component: 'JImageUpload',
componentProps: { componentProps: {
text: '上传头像',
bizPath: 'avatar',
// @ts-ignore // @ts-ignore
maxCount: 1, maxCount: 1,
}, },
src/views/consult/resource/conResource.data.ts
-1
View File
@@ -169,7 +169,6 @@ export const formSchema: FormSchema[] = [
field: 'img', field: 'img',
component: 'JImageUpload', component: 'JImageUpload',
componentProps: { componentProps: {
bizPath: 'img',
fileMax: 1, fileMax: 1,
}, },
rules: [{ required: false }], rules: [{ required: false }],
src/views/emergency/aed/deviceMap/index.vue
+1 -12
View File
@@ -40,7 +40,7 @@
/> />
<div class="bottom-top"> <div class="bottom-top">
<div class="top-title"> <img :src="aedP" alt="" /> {{ showWindowInfo?.name }} </div> <div class="top-title"> <img :src="aedP" alt="" /> {{ showWindowInfo?.name }} </div>
<div class="top-title-bottom"> 距离{{ formatDistance(showWindowInfo?.dis) }} </div> <div class="top-title-bottom"> 距离{{ showWindowInfo?.dis ? showWindowInfo?.dis : 0 }}m </div>
<div class="top-title-describe"> {{ showWindowInfo?.installAddress ? showWindowInfo?.installAddress : '无' }} </div> <div class="top-title-describe"> {{ showWindowInfo?.installAddress ? showWindowInfo?.installAddress : '无' }} </div>
<div class="table-list"> <div class="table-list">
<div class="label-d"> 设备厂家： </div> <div class="label-d"> 设备厂家： </div>
@@ -411,17 +411,6 @@
window.open(getFileAccessHttpUrl(v), '_blank'); 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) { function getName(val, list) {
if (!val && val !== 0) return ''; if (!val && val !== 0) return '';
for (let i = 0; i < list.length; i++) { for (let i = 0; i < list.length; i++) {
src/views/emergency/aed/devices/deviceList.data.ts
-2
View File
@@ -306,7 +306,6 @@ export const getFormSchema = () => {
component: 'JUpload', component: 'JUpload',
componentProps: () => { componentProps: () => {
return { return {
bizPath: 'video',
maxCount: 1, maxCount: 1,
accept: '.mp4,video/mp4', accept: '.mp4,video/mp4',
tipText: '支持MP4格式，最大200M', tipText: '支持MP4格式，最大200M',
@@ -320,7 +319,6 @@ export const getFormSchema = () => {
component: 'JUpload', component: 'JUpload',
componentProps: () => { componentProps: () => {
return { return {
bizPath: 'bizfile',
maxCount: 1, maxCount: 1,
accept: 'application/pdf', accept: 'application/pdf',
tipText: '仅支持PDF格式文件，最大200M', tipText: '仅支持PDF格式文件，最大200M',
src/views/emergency/emergencyManage/emergencyManageList.vue
+13 -13
View File
@@ -212,17 +212,17 @@
const [registerTable, { reload, getForm, getDataSource, setTableData }] = tableContext; const [registerTable, { reload, getForm, getDataSource, setTableData }] = tableContext;
</script> </script>
<style scoped lang="less"> <style scoped lang="less">
//:deep(.ant-table-cell-fix-left, .ant-table-cell-fix-right) { :deep(.ant-table-cell-fix-left, .ant-table-cell-fix-right) {
// position: relative; position: relative;
// //border-bottom: none !important; border-bottom: none !important;
// border-bottom: 2px solid #f0f0f0 !important;
// &:after { &:after {
// position: absolute; position: absolute;
// content: ''; content: '';
// width: 100%; width: 100%;
// top: 0; top: 0;
// left: 0; left: 0;
// border-bottom: 1px solid #f0f0f0; border-bottom: 1px solid #f0f0f0;
// } }
//} }
</style> </style>
src/views/emergency/helper/index.vue
+1 -7
View File
@@ -172,13 +172,7 @@
loadingVisible.value = false; loadingVisible.value = false;
}; };
window.onmessage = async (msg) => { window.onmessage = async (msg) => {
if (!msg.data || typeof msg.data !== 'string') return; const result = JSON.parse(msg.data);
let result: any;
try {
result = JSON.parse(msg.data);
} catch (e) {
return;
}
switch (result.code) { switch (result.code) {
case 'closeLoading': case 'closeLoading':
closeLoading(); closeLoading();
src/views/emergency/personnelManagement/personnelManagement.data.ts
-2
View File
@@ -141,8 +141,6 @@ export const formSchema = function (showGoodAt: boolean): FormSchema[] {
component: 'JImageUpload', component: 'JImageUpload',
required: true, required: true,
componentProps: () => ({ componentProps: () => ({
text: '上传头像',
bizPath: 'avatar',
maxCount: 1, maxCount: 1,
}), }),
}, },
src/views/healthMonitor/healMonitorManage/monitorToll/notificationNews/componets/notificationNewsModal.vue
+2 -5
View File
@@ -7,8 +7,8 @@
</BasicForm> </BasicForm>
<template #footer v-if="title !== '查看'"> <template #footer v-if="title !== '查看'">
<a-button @click="handleCanel">取消</a-button> <a-button @click="handleCanel">取消</a-button>
<a-button type="primary" :loading="submitting" :disabled="submitting" @click="handleSubmit(1)">保存并发送</a-button> <a-button type="primary" @click="handleSubmit(1)">保存并发送</a-button>
<a-button type="primary" :loading="submitting" :disabled="submitting" @click="handleSubmit(2)">保存</a-button> <a-button type="primary" @click="handleSubmit(2)">保存</a-button>
</template> </template>
</BasicModal> </BasicModal>
<ChooseSome <ChooseSome
@@ -35,7 +35,6 @@
// Emits声明 // Emits声明
const emit = defineEmits(['register', 'success', 'userData']); const emit = defineEmits(['register', 'success', 'userData']);
const isUpdate = ref(true); const isUpdate = ref(true);
const submitting = ref(false);
const [examinationModal, { openDrawer }] = useDrawer(); const [examinationModal, { openDrawer }] = useDrawer();
//设置标题 //设置标题
const title = ref(String); const title = ref(String);
@@ -101,7 +100,6 @@
//表单提交事件 //表单提交事件
async function handleSubmit(type: number) { async function handleSubmit(type: number) {
try { try {
submitting.value = true;
let values = await validate(); let values = await validate();
setModalProps({ confirmLoading: true }); setModalProps({ confirmLoading: true });
//提交表单 //提交表单
@@ -111,7 +109,6 @@
//刷新列表 //刷新列表
emit('success'); emit('success');
} finally { } finally {
submitting.value = false;
setModalProps({ confirmLoading: false }); setModalProps({ confirmLoading: false });
} }
} }
src/views/healthMonitor/healMonitorManage/monitorToll/personalData/componets/personalDataModal.vue
+8 -15
View File
@@ -10,8 +10,7 @@
<!-- <div>数据日期：{{ userInfo.dataDate }}</div>--> <!-- <div>数据日期：{{ userInfo.dataDate }}</div>-->
</div> </div>
<div style="width: 75%"> <div style="width: 75%">
<div style="display: flex; justify-content: space-between; align-items: center; padding-right: 30px"> <div style="display: flex; justify-content: flex-end; padding-right: 30px">
<div style="color: #faad14; font-size: 13px; padding-left: 4px">{{ noDataTip }}</div>
<div style="display: flex; font-size: 20px; align-items: center"> <div style="display: flex; font-size: 20px; align-items: center">
<a-button size="small" @click="changeDate('0')"> <a-button size="small" @click="changeDate('0')">
<LeftOutlined /> <LeftOutlined />
@@ -54,14 +53,13 @@
import AllLook from '/@/views/healthMonitor/healMonitorManage/monitorToll/userInfo/componets/allLook.vue'; import AllLook from '/@/views/healthMonitor/healMonitorManage/monitorToll/userInfo/componets/allLook.vue';
import { getDetail, userDataDayByMonth } from '/@/views/healthMonitor/healMonitorManage/monitorToll/personalData/personalData.api'; import { getDetail, userDataDayByMonth } from '/@/views/healthMonitor/healMonitorManage/monitorToll/personalData/personalData.api';
import dayjs from 'dayjs'; import dayjs from 'dayjs';
import { Menu } from 'ant-design-vue'; import { Menu, message } from 'ant-design-vue';
import { LeftOutlined, RightOutlined } from '@ant-design/icons-vue'; import { LeftOutlined, RightOutlined } from '@ant-design/icons-vue';
const userInfo = ref({}); const userInfo = ref({});
const infoData = ref({}); const infoData = ref({});
const userId = ref(''); const userId = ref('');
const haveInfo = ref(''); const haveInfo = ref('');
const nowDate = ref(dayjs()); const nowDate = ref(dayjs());
const noDataTip = ref('');
const loadedYear = ref(dayjs().format('YYYY')); const loadedYear = ref(dayjs().format('YYYY'));
const isRight = computed(() => dayjs(nowDate.value).format('YYYY-MM-DD') != dayjs().format('YYYY-MM-DD')); const isRight = computed(() => dayjs(nowDate.value).format('YYYY-MM-DD') != dayjs().format('YYYY-MM-DD'));
//表单赋值 //表单赋值
@@ -117,18 +115,15 @@
} }
async function getInfo() { async function getInfo() {
const dateStr = dayjs(nowDate.value).format('YYYY-MM-DD');
await getDetail({ await getDetail({
userId: userId.value, userId: userId.value,
dataDate: dateStr, dataDate: dayjs(nowDate.value).format('YYYY-MM-DD'),
}).then((res) => { }).then((res) => {
// openModal(true, {
// record,
// dataInfo: res,
// });
infoData.value = res; infoData.value = res;
// API 返回空数据时行内提示，否则清空提示
if (!res || Object.keys(res).length === 0) {
noDataTip.value = `【${dateStr}】暂无监测数据`;
} else {
noDataTip.value = '';
}
}); });
} }
@@ -143,9 +138,7 @@
if (getDisabled(nowDate.value)) { if (getDisabled(nowDate.value)) {
getInfo(); getInfo();
} else { } else {
// 本地记录无数据：清空展示数据并行内提示具体日期 message.info('当日暂无监测数据');
infoData.value = {};
noDataTip.value = `【${dayjs(nowDate.value).format('YYYY-MM-DD')}】暂无监测数据`;
} }
} }
src/views/healthMonitor/healMonitorManage/monitorToll/sectoralData/sectoralData.data.ts
+9 -65
View File
@@ -3,6 +3,7 @@ import { message } from 'ant-design-vue';
import { allSecondaryDepartsNew, getThirdDepartsNew } from '/@/utils/system/api'; import { allSecondaryDepartsNew, getThirdDepartsNew } from '/@/utils/system/api';
import moment from 'moment'; import moment from 'moment';
import dayjs from 'dayjs'; import dayjs from 'dayjs';
import { h } from 'vue';
export const columns: BasicColumn[] = [ export const columns: BasicColumn[] = [
{ {
@@ -133,6 +134,10 @@ export const columnsNew: BasicColumn[] = [
{ {
title: '单位名称', title: '单位名称',
dataIndex: ['orgCodeName'], dataIndex: ['orgCodeName'],
customRender: ({ text, record }) => {
const isRed = record?.orgCode?.length === 3;
return h('span', { style: isRed ? { color: 'red' } : {} }, text);
},
}, },
{ {
title: '部门名称', title: '部门名称',
@@ -160,11 +165,11 @@ export const columnsNew: BasicColumn[] = [
}, },
{ {
title: '未分配设备数', title: '未分配设备数',
dataIndex: 'undistributedDeviceNums', dataIndex: 'unassignedDeviceNums',
customRender: ({ record }) => { customRender: ({ record }) => {
const total = record.totalAssignedDeviceNums ?? 0; const total = record.totalAssignedDeviceNums ?? 0;
const assigned = record.assignedDeviceNums ?? 0; const assigned = record.assignedDeviceNums ?? 0;
return Math.max(0, total - assigned); return total - assigned;
}, },
}, },
{ {
@@ -177,11 +182,11 @@ export const columnsNew: BasicColumn[] = [
}, },
{ {
title: '未绑定设备数', title: '未绑定设备数',
dataIndex: 'undistributedDeviceNums', dataIndex: 'unassignedDeviceNums',
customRender: ({ record }) => { customRender: ({ record }) => {
const total = record.totalAssignedDeviceNums ?? 0; const total = record.totalAssignedDeviceNums ?? 0;
const assigned = record.assignedDeviceNums ?? 0; const assigned = record.assignedDeviceNums ?? 0;
return Math.max(0, total - assigned); return total - assigned;
}, },
}, },
{ {
@@ -192,15 +197,6 @@ export const columnsNew: BasicColumn[] = [
return text; return text;
}, },
}, },
{
title: '关爱人员佩戴人数',
dataIndex: ['careWearNums'],
width: 150,
customRender: ({ text }) => {
if (!text) return 0;
return text;
},
},
{ {
title: '未佩戴人员数', title: '未佩戴人员数',
dataIndex: ['undistributedUserNums'], dataIndex: ['undistributedUserNums'],
@@ -209,47 +205,6 @@ export const columnsNew: BasicColumn[] = [
return text; return text;
}, },
}, },
{
title: '关爱人员未佩戴人数',
dataIndex: ['careUnwearNums'],
width: 160,
customRender: ({ text }) => {
if (!text) return 0;
return text;
},
},
{
title: '关爱人员未佩戴人数\n（仅计入统计日期起期已绑定的人数）',
dataIndex: ['careUnwearAtStartNums'],
width: 180,
customHeaderCell: () => {
return {
style: {
whiteSpace: 'pre-wrap',
},
};
},
customRender: ({ text }) => {
if (!text) return 0;
return text;
},
},
{
title: '非关爱人员数量',
dataIndex: ['nonCareNums'],
customRender: ({ text }) => {
if (!text) return 0;
return text;
},
},
{
title: '关爱人员数量',
dataIndex: ['careNums'],
customRender: ({ text }) => {
if (!text) return 0;
return text;
},
},
{ {
title: '心率异常人数', title: '心率异常人数',
dataIndex: ['heartRateNums'], dataIndex: ['heartRateNums'],
@@ -282,7 +237,6 @@ export const columnsNew: BasicColumn[] = [
return text; return text;
}, },
}, },
]; ];
const startTime = dayjs().subtract(6, 'day').format('YYYY-MM-DD'); const startTime = dayjs().subtract(6, 'day').format('YYYY-MM-DD');
@@ -427,16 +381,6 @@ export const detailColumns = (arr: BasicColumn[] = []) => {
title: '手表所属单位', title: '手表所属单位',
dataIndex: 'watchOrgName', dataIndex: 'watchOrgName',
}, },
{
title: '非关爱人员',
dataIndex: 'nonCareFlag',
width: 100,
customRender: ({ text }) => {
if (text === 1) return '是';
if (text === 0) return '否';
return '';
},
},
...arr, ...arr,
{ {
title: '应佩戴天数', title: '应佩戴天数',
src/views/healthMonitor/healMonitorManage/monitorToll/sectoralData/sectoralDataList.vue
+4 -1
View File
@@ -88,20 +88,23 @@
const [registerTable, { reload, getForm }] = tableContext; const [registerTable, { reload, getForm }] = tableContext;
function getTableAction(record: any) { function getTableAction(record: any) {
let orgCodeLenth = record?.orgCode?.length;
let flag = record?.orgCodeLeafName == '-'; let flag = record?.orgCodeLeafName == '-';
return [ return [
{ {
label: '明细', label: '明细',
onClick: handleDetail.bind(null, record), onClick: handleDetail.bind(null, record),
disabled: orgCodeLenth < 6,
}, },
{ {
label: '明细导出', label: '明细导出',
onClick: handleExport.bind(null, record), onClick: handleExport.bind(null, record),
disabled: orgCodeLenth < 6,
}, },
{ {
label: '周报', label: '周报',
onClick: handleWeekReport.bind(null, record), onClick: handleWeekReport.bind(null, record),
disabled: !flag, disabled: !flag || orgCodeLenth < 6,
}, },
]; ];
} }
src/views/healthMonitor/healMonitorManage/monitorToll/toolManagement/components/bindModal.vue
+1 -1
View File
@@ -105,7 +105,7 @@
// orgCodeSecond:data.record?.orgCode // orgCodeSecond:data.record?.orgCode
}); });
bindUserId.value = data.record?.bindUserId; bindUserId.value = data.record?.bindUserId;
paramsInfo.value = { orgCode: data.record?.orgCode }; paramsInfo.value = { orgCode: 'A01' };
await clearValidate(); await clearValidate();
// 隐藏底部时禁用整个表单 // 隐藏底部时禁用整个表单
await setProps({ disabled: !data?.showFooter }); await setProps({ disabled: !data?.showFooter });
src/views/healthMonitor/healMonitorManage/monitorToll/toolManagement/toolManagement.data.ts
+88 -55
View File
@@ -211,21 +211,16 @@ export const formSchema: FormSchema[] = [
field: 'deptId', field: 'deptId',
required: true, required: true,
component: 'ApiSelect', component: 'ApiSelect',
componentProps: ({ formModel }) => { defaultValue: '1683768826307096578',
const { getVal: getVal1, disabled: disabled1 } = initD(); show: false,
getVal1('id'); componentProps: () => {
return { return {
api: allSecondaryDepartsNew, api: allSecondaryDepartsNew,
resultField: 'result', resultField: 'result',
labelField: 'departName', labelField: 'departName',
immediate: true, immediate: true,
valueField: 'id', valueField: 'id',
disabled: disabled1, disabled: true,
afterFetch: (res: any) => {
if (res.length === 1) {
formModel.deptId = res[0].id;
}
},
getPopupContainer: () => document.body, getPopupContainer: () => document.body,
showSearch: true, showSearch: true,
filterOption: (input: string, option: any): boolean => { filterOption: (input: string, option: any): boolean => {
@@ -326,40 +321,40 @@ export const rkFormSchema: FormSchema[] = [
required: true, required: true,
slot: 'file', slot: 'file',
}, },
{ // {
label: '单位名称', // label: '单位名称',
field: 'deptId', // field: 'deptId',
component: 'ApiSelect', // component: 'ApiSelect',
required: true, // required: true,
componentProps: ({ formModel, schema }) => { // componentProps: ({ formModel, schema }) => {
const { getVal, disabled } = initD(); // const { getVal, disabled } = initD();
getVal('id'); // getVal('id');
return { // return {
api: allSecondaryDepartsNew, // api: allSecondaryDepartsNew,
resultField: 'list', // resultField: 'list',
labelField: 'departName', // labelField: 'departName',
valueField: 'id', // valueField: 'id',
immediate: true, // immediate: true,
onChange: (val: any) => { // onChange: (val: any) => {
if (val) { // if (val) {
formModel['orgId'] = ''; // formModel['orgId'] = '';
} // }
}, // },
onDeselect: () => { // onDeselect: () => {
formModel.deptId = ''; // formModel.deptId = '';
formModel['orgId'] = ''; // formModel['orgId'] = '';
}, // },
showSearch: true, // showSearch: true,
filterOption: (input: string, option: any): boolean => { // filterOption: (input: string, option: any): boolean => {
const str: string = input.toLowerCase(); // const str: string = input.toLowerCase();
return option.label.toLowerCase().indexOf(str) >= 0; // return option.label.toLowerCase().indexOf(str) >= 0;
}, // },
disabled: disabled, // disabled: disabled,
getPopupContainer: () => document.body, // getPopupContainer: () => document.body,
}; // };
}, // },
}, // },
{ /*{
label: '部门名称', label: '部门名称',
field: 'orgId', field: 'orgId',
component: 'ApiSelect', component: 'ApiSelect',
@@ -390,7 +385,7 @@ export const rkFormSchema: FormSchema[] = [
}; };
}, },
show: false, show: false,
}, },*/
]; ];
// 绑定导入 // 绑定导入
export const bindUserFormSchema: FormSchema[] = [ export const bindUserFormSchema: FormSchema[] = [
@@ -726,6 +721,11 @@ export const mColumns: BasicColumn[] = [
dataIndex: 'realname', dataIndex: 'realname',
align: 'center', align: 'center',
}, },
{
title: '单位名称',
dataIndex: ['secondDepart', 'departName'],
align: 'center',
},
{ {
title: '部门名称', title: '部门名称',
dataIndex: ['depart', 'departName'], dataIndex: ['depart', 'departName'],
@@ -737,7 +737,7 @@ export const mColumns: BasicColumn[] = [
align: 'center', align: 'center',
}, },
]; ];
export const mSearchFormSchema = (orgCode) => { export const mSearchFormSchema = (orgCode = 'orgCode', orgCode1 = 'orgCode1', threeOrgCode = 'threeOrgCode') => {
const schemaInfo: FormSchema[] = [ const schemaInfo: FormSchema[] = [
{ {
label: '员工姓名', label: '员工姓名',
@@ -746,33 +746,66 @@ export const mSearchFormSchema = (orgCode) => {
}, },
{ {
label: '单位', label: '单位名称',
field: 'orgCode', field: orgCode1,
component: 'Input', component: 'ApiSelect',
defaultValue: orgCode, componentProps: ({ formModel, schema }) => {
show: false, return {
api: allSecondaryDepartsNew,
resultField: 'list',
labelField: 'departName',
valueField: 'orgCode',
placeholder: '请选择单位',
showSearch: true,
filterOption: (input: string, option: any): boolean => {
const str: string = input.trim().toLowerCase();
return option.departName.toLowerCase().indexOf(str) >= 0;
},
onChange: (val) => {
// 选中单位时，orgCode 赋值为单位的 orgCode，并清空部门
formModel[orgCode] = val || '';
formModel[threeOrgCode] = '';
},
onDeselect: () => {
formModel[orgCode] = '';
formModel[orgCode1] = '';
formModel[threeOrgCode] = '';
},
};
},
}, },
{ {
label: '部门名称', label: '部门名称',
field: 'threeOrgCode', field: threeOrgCode,
component: 'ApiSelect', component: 'ApiSelect',
componentProps: ({ formModel }) => { componentProps: ({ formModel }) => {
console.log(formModel, '11111111111');
return { return {
api: getThirdDepartsNew, api: getThirdDepartsNew,
resultField: 'list', resultField: 'list',
labelField: 'departName', labelField: 'departName',
params: {
idOrCode: formModel?.orgCode || '12313',
},
valueField: 'orgCode', valueField: 'orgCode',
placeholder: '请选择部门',
showSearch: true,
params: {
idOrCode: formModel[orgCode1] || '12313',
},
immediate: true, immediate: true,
style: { style: {
width: '195px', width: '195px',
}, },
onChange: (val) => {
// 选中部门时覆盖 orgCode，清空时回退到单位的 orgCode
formModel[orgCode] = val || formModel[orgCode1] || '';
},
}; };
}, },
}, },
{
label: '',
field: orgCode,
component: 'Input',
show: false,
},
{ {
label: '员工编号', label: '员工编号',
field: 'workNo', field: 'workNo',
src/views/healthMonitor/healMonitorManage/monitorToll/userInfo/componets/sleep.vue
+9 -11
View File
@@ -168,32 +168,30 @@
let xArr: any[] = []; let xArr: any[] = [];
let yArr: any[] = []; let yArr: any[] = [];
res.timePeriods && res.timePeriods &&
res.timePeriods.map((item) => { res.timePeriods.forEach((item) => {
switch (item.flag) { switch (item.flag) {
case 1: case 1:
// 浅睡 // 浅睡
yArr.push(1); yArr.push(1, 1, null);
yArr.push(1);
break; break;
case 3: case 3:
// 深睡 // 深睡
yArr.push(0); yArr.push(0, 0, null);
yArr.push(0);
break; break;
case 4: case 4:
// 清醒 // 清醒
yArr.push(3); yArr.push(3, 3, null);
yArr.push(3);
break; break;
case 5: case 5:
// 零星小睡 // 零星小睡
yArr.push(2); yArr.push(2, 2, null);
yArr.push(2);
break; break;
} }
xArr.push(dayjs(item.start).format('HH:mm')); xArr.push(dayjs(item.start).format('HH:mm'), dayjs(item.end).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 = { const option = {
xAxis: { xAxis: {
type: 'category', type: 'category',
src/views/system/dict/dict.data.ts
+1 -1
View File
@@ -73,7 +73,7 @@ export const formSchema: FormSchema[] = [
dynamicDisabled: ({ values }) => { dynamicDisabled: ({ values }) => {
return !!values.id; return !!values.id;
}, },
dynamicRules: ({ model, schema }) => rules.duplicateCheckRule('QH_SYS_DICT', 'dict_code', model, schema, true), dynamicRules: ({ model, schema }) => rules.duplicateCheckRule('sys_dict', 'dict_code', model, schema, true),
}, },
{ {
label: '描述', label: '描述',
src/views/system/message/template/template.data.ts
+1 -1
View File
@@ -77,7 +77,7 @@ export const formSchemas: FormSchema[] = [
field: 'templateCode', field: 'templateCode',
component: 'Input', component: 'Input',
dynamicRules: ({ model, schema }) => { dynamicRules: ({ model, schema }) => {
return [...rules.duplicateCheckRule('QH_SYS_SMS_TEMPLATE', 'template_code', model, schema, true)]; return [...rules.duplicateCheckRule('sys_sms_template', 'template_code', model, schema, true)];
}, },
// 编辑模式下不可修改编码 // 编辑模式下不可修改编码
dynamicDisabled: (params) => !!params.values.id, dynamicDisabled: (params) => !!params.values.id,
src/views/system/systemBanner/SysBanner.data.ts
-6
View File
@@ -74,8 +74,6 @@ export const searchFormSchema: FormSchema[] = [
}, },
]; ];
//表单数据 //表单数据
// @ts-ignore
// @ts-ignore
export const formSchema: FormSchema[] = [ export const formSchema: FormSchema[] = [
{ {
label: '序号', label: '序号',
@@ -93,10 +91,6 @@ export const formSchema: FormSchema[] = [
label: '图片', label: '图片',
field: 'photoUrl', field: 'photoUrl',
component: 'JImageUpload', component: 'JImageUpload',
componentProps: {
bizPath: 'img',
maxCount: 1,
},
rules: [{ required: true, message: '请上传图片' }], rules: [{ required: true, message: '请上传图片' }],
}, },
{ {
src/views/system/user/HealthUserEmployeeEx/HealthUserEmployeeEx.data.ts
+3 -39
View File
@@ -85,13 +85,6 @@ export const columns: BasicColumn[] = [
dataIndex: ['departTree', '3'], dataIndex: ['departTree', '3'],
width: 180, width: 180,
}, },
{
title: '非关爱人员',
align: 'center',
dataIndex: ['extension', 'nonCareFlag'],
width: 100,
slots: { customRender: 'nonCareTag' },
},
{ {
title: '出生日期', title: '出生日期',
align: 'center', align: 'center',
@@ -167,17 +160,6 @@ export const searchFormSchema: FormSchema[] = [
field: 'phone', field: 'phone',
component: 'Input', component: 'Input',
}, },
{
label: '非关爱人员',
field: 'nonCareFlag',
component: 'Select',
componentProps: {
options: [
{ label: '否', value: 0 },
{ label: '是', value: 1 },
],
},
},
{ {
label: '单位名称', label: '单位名称',
field: 'orgCode', field: 'orgCode',
@@ -329,7 +311,7 @@ export const formSchema: (isUpdate: boolean) => FormSchema[] = (isUpdate) => {
}; };
}, },
dynamicRules: ({ model, schema }) => { dynamicRules: ({ model, schema }) => {
let rule = rules.duplicateCheckRuleAndDelFlag('QH_HLT_USER_EMPLOYEE_EX', 'EMP_SYSNO', 'false', model, schema, false); let rule = rules.duplicateCheckRuleAndDelFlag('health_user_employee_ex', 'emp_sysno', 'false', model, schema, false);
rule[0] = { ...rule[0], required: false }; rule[0] = { ...rule[0], required: false };
return rule; return rule;
}, },
@@ -348,8 +330,6 @@ export const formSchema: (isUpdate: boolean) => FormSchema[] = (isUpdate) => {
field: 'avatar', field: 'avatar',
component: 'JImageUpload', component: 'JImageUpload',
componentProps: { componentProps: {
text: '上传头像',
bizPath: 'avatar',
maxCount: 1, maxCount: 1,
}, },
}, },
@@ -694,44 +674,28 @@ export const formSchema: (isUpdate: boolean) => FormSchema[] = (isUpdate) => {
label: '关爱联络员姓名', label: '关爱联络员姓名',
field: 'careLiaisonName', field: 'careLiaisonName',
component: 'Input', component: 'Input',
show: false,
}, },
{ {
label: '关爱联络员职务', label: '关爱联络员职务',
field: 'careLiaisonJob', field: 'careLiaisonJob',
component: 'Input', component: 'Input',
show: false,
}, },
{ {
label: '关爱联络员电话', label: '关爱联络员电话',
field: 'careLiaisonPhone', field: 'careLiaisonPhone',
component: 'Input', component: 'Input',
// rules: [{ required: false, pattern: /^1[3456789]\d{9}$/, message: '手机号码格式有误', trigger: 'blur' }], rules: [{ required: false, pattern: /^1[3456789]\d{9}$/, message: '手机号码格式有误', trigger: 'blur' }],
show: false,
}, },
{ {
label: '急救人员姓名', label: '急救人员姓名',
field: 'lifeguardName', field: 'lifeguardName',
component: 'Input', component: 'Input',
show: false,
}, },
{ {
label: '急救人员电话', label: '急救人员电话',
field: 'lifeguardPhone', field: 'lifeguardPhone',
component: 'Input', component: 'Input',
// rules: [{ required: false, pattern: /^1[3456789]\d{9}$/, message: '手机号码格式有误', trigger: 'blur' }], rules: [{ required: false, pattern: /^1[3456789]\d{9}$/, message: '手机号码格式有误', trigger: 'blur' }],
show: false,
},
{
label: '非关爱人员',
field: 'nonCareFlag',
component: 'RadioButtonGroup',
componentProps: {
options: [
{ label: '否', value: 0 },
{ label: '是', value: 1 },
],
},
}, },
{ {
label: '', label: '',
src/views/system/user/HealthUserEmployeeEx/HealthUserEmployeeExList.vue
-4
View File
@@ -109,10 +109,6 @@
{{ record.status_dictText }} {{ record.status_dictText }}
</Tag> </Tag>
</template> </template>
<template #nonCareTag="{ record }">
<Tag v-if="record.extension?.nonCareFlag === 1" color="orange">是</Tag>
<Tag v-else-if="record.extension?.nonCareFlag === 0" color="blue">否</Tag>
</template>
</BasicTable> </BasicTable>
<!-- 表单区域 --> <!-- 表单区域 -->
<HealthUserEmployeeExDrawer :showFooter="showFooter" @register="registerDrawer" @success="handleSuccess" /> <HealthUserEmployeeExDrawer :showFooter="showFooter" @register="registerDrawer" @success="handleSuccess" />
src/views/system/user/healthUserDoctorEx/HealthUserDoctorEx.data.ts
-2
View File
@@ -207,8 +207,6 @@ export const formSchema: FormSchema[] = [
label: '头像', label: '头像',
component: 'JImageUpload', component: 'JImageUpload',
componentProps: { componentProps: {
text: '上传头像',
bizPath: 'avatar',
maxCount: 1, maxCount: 1,
}, },
}, },
src/views/system/user/personnelManagement/personnelManagement.data.ts
-2
View File
@@ -141,8 +141,6 @@ export const formSchema = function (showGoodAt: boolean): FormSchema[] {
component: 'JImageUpload', component: 'JImageUpload',
required: true, required: true,
componentProps: () => ({ componentProps: () => ({
text: '上传头像',
bizPath: 'avatar',
maxCount: 1, maxCount: 1,
}), }),
}, },
src/views/system/user/user.data.ts
+4 -4
View File
@@ -219,7 +219,7 @@ export const formSchema: FormSchema[] = [
}, },
dynamicRules: ({ model, schema }) => { dynamicRules: ({ model, schema }) => {
if (model.id) { if (model.id) {
return rules.duplicateCheckRule('QH_SYS_USER', 'username', model, schema, true); return rules.duplicateCheckRule('sys_user', 'username', model, schema, true);
} else { } else {
return Promise.resolve(); return Promise.resolve();
} }
@@ -266,7 +266,7 @@ export const formSchema: FormSchema[] = [
field: 'workNo', field: 'workNo',
required: true, required: true,
component: 'Input', component: 'Input',
dynamicRules: ({ model, schema }) => rules.duplicateCheckRule('QH_SYS_USER', 'work_no', model, schema, true), dynamicRules: ({ model, schema }) => rules.duplicateCheckRule('sys_user', 'work_no', model, schema, true),
}, },
{ {
label: '职务', label: '职务',
@@ -379,7 +379,7 @@ export const formSchema: FormSchema[] = [
field: 'email', field: 'email',
component: 'Input', component: 'Input',
dynamicRules: ({ model, schema }) => { dynamicRules: ({ model, schema }) => {
return [{ ...rules.duplicateCheckRule('QH_SYS_USER', 'email', model, schema, true)[0] }, { ...rules.rule('email', false)[0] }]; return [{ ...rules.duplicateCheckRule('sys_user', 'email', model, schema, true)[0] }, { ...rules.rule('email', false)[0] }];
}, },
}, },
{ {
@@ -388,7 +388,7 @@ export const formSchema: FormSchema[] = [
component: 'Input', component: 'Input',
dynamicRules: ({ model, schema }) => { dynamicRules: ({ model, schema }) => {
return [ return [
{ ...rules.duplicateCheckRule('QH_SYS_USER', 'phone', model, schema, true)[0] }, { ...rules.duplicateCheckRule('sys_user', 'phone', model, schema, true)[0] },
{ pattern: /^1[3456789]\d{9}$/, message: '手机号码格式有误' }, { pattern: /^1[3456789]\d{9}$/, message: '手机号码格式有误' },
]; ];
}, },
src/views/system/usersetting/commponents/UserEmailModal.vue
+1 -1
View File
@@ -35,7 +35,7 @@
const validatorRules: Record<string, Rule[]> = { const validatorRules: Record<string, Rule[]> = {
email: [ email: [
{ ...rules.duplicateCheckRule('QH_SYS_USER', 'email', formState, { label: '邮箱' })[0] }, { ...rules.duplicateCheckRule('sys_user', 'email', formState, { label: '邮箱' })[0] },
{ required: true, type: 'email', message: '邮箱格式不正确' }, { required: true, type: 'email', message: '邮箱格式不正确' },
], ],
}; };
src/views/system/usersetting/commponents/UserPhoneModal.vue
+1 -1
View File
@@ -40,7 +40,7 @@
const validatorRules: Record<string, Rule[]> = { const validatorRules: Record<string, Rule[]> = {
phone: [ phone: [
{ ...rules.duplicateCheckRule('QH_SYS_USER', 'phone', formState, { label: '手机号' })[0] }, { ...rules.duplicateCheckRule('sys_user', 'phone', formState, { label: '手机号' })[0] },
{ pattern: /^1[3456789]\d{9}$/, message: '手机号码格式有误' }, { pattern: /^1[3456789]\d{9}$/, message: '手机号码格式有误' },
], ],
smscode: [{ required: true, message: '请输入验证码' }], smscode: [{ required: true, message: '请输入验证码' }],
src/views/system/versionUpdate/vesrsion.data.ts
-1
View File
@@ -154,7 +154,6 @@ export const itemFormSchema: FormSchema[] = [
component: 'JUpload', component: 'JUpload',
componentProps: () => { componentProps: () => {
return { return {
bizPath: 'appfile',
maxCount: 1, maxCount: 1,
}; };
}, },