diff --git a/config/router.config.ts b/config/router.config.ts index c05c582..d826d9d 100644 --- a/config/router.config.ts +++ b/config/router.config.ts @@ -4,6 +4,7 @@ import home from './HomePage/router_home'; import juryRoom from './JuryRoom/router_menuJury.config'; import approvalForm from './router_approval_form'; import partyMemberTopic from './router_partyMemberTopic'; +import { elecBidEvaluation, monitorScreen } from './router_elecEvaluation'; export default [ //========================================================================登陆 ...transfer,//跳转、登陆 @@ -11,6 +12,8 @@ export default [ ...approvalForm, //党建攻坚 ...partyMemberTopic, + //电子评标室-监控大屏 + ...monitorScreen, { path: '/userformal', // component: '../layouts/UserLayout', @@ -47,28 +50,6 @@ export default [ path: '/401', component: './401', }, - { - path: '/MonitorScreen', - routes: [ - { - name: 'Home', - path: '/MonitorScreen/Home', - component: './MonitorScreen/Home', - }, - { - name: 'MonitorRoom', - path: '/MonitorScreen/MonitorRoom', - component: './MonitorScreen/MonitorRoom', - }, - { - name: 'ProjectMonitorRoom', - path: '/MonitorScreen/ProjectMonitorRoom', - component: './MonitorScreen/ProjectMonitorRoom', - }, - ], - }, - - {//开标室 path: '/room', @@ -129,22 +110,9 @@ export default [ path: '/', redirect: '/userexpert/login', }, - {//设备管理 - name: 'Device', - path: '/Device', - component: './Device', - }, - {//评标室查看预约 - name: 'ElecEvalReserve', - path: '/ElecEvalReserve', - component: './ElecEvalReserve', - }, ...home,//各角色主页 ...menuaZhaoBiao,//项目菜单所有路由 - { - path: '/AppointmentManage', - component: './AppointmentManage', - }, + ...elecBidEvaluation,//电子评标室-监控大屏 {//问卷调查 name: 'Questionnaire', icon: 'UnorderedListOutlined', @@ -335,23 +303,6 @@ export default [ }, ], }, - {//评标现场管理 - name: 'EvalSiteManage', - icon: 'form', - path: '/EvalSiteManage', - routes: [ - {//评标现场管理->评标场所人员维护 - name: 'SitePerson', - path: '/EvalSiteManage/SitePerson', - component: './EvalSiteManage/SitePerson' - }, - {//评标现场管理->人员报道情况查询 - name: 'PersonReport', - path: '/EvalSiteManage/PersonReport', - component: './EvalSiteManage/PersonReport' - }, - ], - }, {//供应商常用信息管理 name: 'supplierInformation', icon: 'crown', @@ -374,22 +325,6 @@ export default [ }, ] }, - //在线监督和事后监督 - { - path: '/VideoMonitor', - routes: [ - { - name: 'Online', - path: '/VideoMonitor/Online', - component: './VideoMonitor/Online', - }, - { - name: 'Post', - path: '/VideoMonitor/Post', - component: './VideoMonitor/Post', - }, - ], - }, {//账号信息管理-代理机构管理员 name: 'Account', icon: 'form', @@ -402,11 +337,6 @@ export default [ }, ], }, - {//异常告警 - name: 'AbnormalAlarm', - path: '/AbnormalAlarm', - component: './AbnormalAlarm' - }, { component: './404', }, diff --git a/config/router_elecEvaluation.ts b/config/router_elecEvaluation.ts new file mode 100644 index 0000000..4d4886b --- /dev/null +++ b/config/router_elecEvaluation.ts @@ -0,0 +1,71 @@ +export const monitorScreen = [ + //监控大屏 + { + path: '/ElecMonitorScreen', + routes: [ + {//监控大屏-首页 + path: '/ElecMonitorScreen/Home', + component: './ElecEvaluation/MonitorScreen/Home', + }, + {//监控大屏-评标室列表页 + path: '/ElecMonitorScreen/MonitorRoom', + component: './ElecEvaluation/MonitorScreen/MonitorRoom', + }, + {//监控大屏-评标室详情 + path: '/ElecMonitorScreen/ProjectMonitorRoom', + component: './ElecEvaluation/MonitorScreen/ProjectMonitorRoom', + }, + ], + }, +] + +export const elecBidEvaluation = [ + { + path: '/ElecEvaluation', + routes: [ + //在线监督和事后监督 + { + path: '/ElecEvaluation/VideoMonitor', + routes: [ + { + path: '/ElecEvaluation/VideoMonitor/Online', + component: './ElecEvaluation/VideoMonitor/Online', + }, + { + path: '/ElecEvaluation/VideoMonitor/Post', + component: './ElecEvaluation/VideoMonitor/Post', + }, + ], + }, + {//异常告警 + path: '/ElecEvaluation/AbnormalAlarm', + component: './ElecEvaluation/AbnormalAlarm' + }, + {//设备管理 + path: '/ElecEvaluation/Device', + component: './ElecEvaluation/Device', + }, + {//评标现场管理 + path: '/ElecEvaluation/EvalSiteManage', + routes: [ + {//评标现场管理->评标场所人员维护 + path: '/ElecEvaluation/EvalSiteManage/SitePerson', + component: './ElecEvaluation/EvalSiteManage/SitePerson' + }, + {//评标现场管理->人员报道情况查询 + path: '/ElecEvaluation/EvalSiteManage/PersonReport', + component: './ElecEvaluation/EvalSiteManage/PersonReport' + }, + ], + }, + {//评标室预约情况 + path: '/ElecEvaluation/AppointmentManage', + component: './ElecEvaluation/AppointmentManage', + }, + {//评标室查看预约 + path: '/ElecEvaluation/ElecEvalReserve', + component: './ElecEvaluation/ElecEvalReserve', + }, + ], + }, +] \ No newline at end of file diff --git a/src/pages/AbnormalAlarm/index.tsx b/src/pages/ElecEvaluation/AbnormalAlarm/index.tsx similarity index 71% rename from src/pages/AbnormalAlarm/index.tsx rename to src/pages/ElecEvaluation/AbnormalAlarm/index.tsx index 11d244f..b7a1f8d 100644 --- a/src/pages/AbnormalAlarm/index.tsx +++ b/src/pages/ElecEvaluation/AbnormalAlarm/index.tsx @@ -2,24 +2,24 @@ import React, { useState, useRef } from 'react'; import { message, PageHeader, Button, Spin } from 'antd'; import ProTable, { ProColumns, ActionType } from '@ant-design/pro-table'; import { getPage, handleAlarm } from './service'; -import ViewEvalAlarmUpdateModal from '../Evaluation/BidControl/BidControlManager/components/ViewEvalAlarmUpdateModal'; +import ViewEvalAlarmUpdateModal from '../../Evaluation/BidControl/BidControlManager/components/ViewEvalAlarmUpdateModal'; interface alarmData { - tilte:string;//标题 - id:string;//告警id - reserveId:string;//预约id - tpName:string;//项目名称 - tpNumber:string;//项目编号 - bsName:string;//标段名称 - placeName:string; //评标室名称 - startDate:string; //开始时间 - endDate:string; //结束时间 - status:string;//处理状态:0未处理;1已处理', - roomStatus:string;//评标室状态 0-未开启 1-进行中 2-已结束 - pNumber:string;//人数信息 - remark:string;//处理说明 - attachment:string;//附件id + tilte: string;//标题 + id: string;//告警id + reserveId: string;//预约id + tpName: string;//项目名称 + tpNumber: string;//项目编号 + bsName: string;//标段名称 + placeName: string; //评标室名称 + startDate: string; //开始时间 + endDate: string; //结束时间 + status: string;//处理状态:0未处理;1已处理', + roomStatus: string;//评标室状态 0-未开启 1-进行中 2-已结束 + pNumber: string;//人数信息 + remark: string;//处理说明 + attachment: string;//附件id } const AbnormalAalarm: React.FC<{}> = () => { @@ -34,7 +34,7 @@ const AbnormalAalarm: React.FC<{}> = () => { pageSize: 10 }); - const alarm:alarmData ={ + const alarm: alarmData = { tilte: "测试", id: '', reserveId: '', @@ -54,25 +54,26 @@ const AbnormalAalarm: React.FC<{}> = () => { //委托列表 const columns: ProColumns[] = [ { - title: '序号', valueType: 'index', width: 50, hideInSearch:true, align: 'center' + title: '序号', valueType: 'index', width: 50, hideInSearch: true, align: 'center' }, { title: '项目名称', dataIndex: 'projectName', width: '15%', hideInSearch: false, align: 'center' }, { title: '标段名称', dataIndex: 'sectionName', hideInSearch: false, align: 'center' }, - { title: '评审室名称', dataIndex: 'areaName', width: '10%',hideInSearch:true, align: 'center' }, - { title: '告警设备类型', dataIndex: 'deviceType', hideInSearch:true, align: 'center' }, - { title: '告警设备编号', dataIndex: 'deviceCode', width: '15%', hideInSearch:true, align: 'center'}, - { title: '告警消息', dataIndex: 'type', hideInSearch: false, align: 'center', + { title: '评审室名称', dataIndex: 'areaName', width: '10%', hideInSearch: true, align: 'center' }, + { title: '告警设备类型', dataIndex: 'deviceType', hideInSearch: true, align: 'center' }, + { title: '告警设备编号', dataIndex: 'deviceCode', width: '15%', hideInSearch: true, align: 'center' }, + { + title: '告警消息', dataIndex: 'type', hideInSearch: false, align: 'center', valueEnum: { - 1: { text: '设备离线'}, - 2: { text: '人员数量异常'}, - 3: { text: '陌生人告警'}, + 1: { text: '设备离线' }, + 2: { text: '人员数量异常' }, + 3: { text: '陌生人告警' }, } }, { - title: '处理状态', dataIndex: 'status', align: 'center',hideInSearch: true, + title: '处理状态', dataIndex: 'status', align: 'center', hideInSearch: true, valueEnum: { - 0: { text: '未处理'}, - 1: { text: '已处理'}, + 0: { text: '未处理' }, + 1: { text: '已处理' }, } }, { @@ -80,13 +81,13 @@ const AbnormalAalarm: React.FC<{}> = () => { valueType: 'option', render: (_, record) => { if (record.type === "1") { - if(record.status === "0"){ + if (record.status === "0") { return } } else { return ( ) - } + } } }, ]; @@ -111,7 +112,7 @@ const AbnormalAalarm: React.FC<{}> = () => { hide(); message.error('处理失败请重试!'); return false; - }finally{ + } finally { setSpin(false); } }; @@ -120,30 +121,30 @@ const AbnormalAalarm: React.FC<{}> = () => { * @param record 列表数据 */ const EnvData = (record: any) => { - alarm.tilte=getTypeValue(record.type); - alarm.tpName=record.projectName; - alarm.tpNumber=record.projectNum; - alarm.bsName=record.sectionName; - alarm.id=record.id; - alarm.reserveId=record.reserveId; - alarm.placeName=record.areaName; - alarm.startDate=record.startDate; - alarm.endDate=record.endDate; - alarm.pNumber=record.pnumber; - alarm.status=record.status; - alarm.roomStatus=record.roomStatus; - alarm.remark=record.remark; - alarm.attachment=record.attachment; + alarm.tilte = getTypeValue(record.type); + alarm.tpName = record.projectName; + alarm.tpNumber = record.projectNum; + alarm.bsName = record.sectionName; + alarm.id = record.id; + alarm.reserveId = record.reserveId; + alarm.placeName = record.areaName; + alarm.startDate = record.startDate; + alarm.endDate = record.endDate; + alarm.pNumber = record.pnumber; + alarm.status = record.status; + alarm.roomStatus = record.roomStatus; + alarm.remark = record.remark; + alarm.attachment = record.attachment; setAlarmData(alarm); } - function getTypeValue(key:any){ + function getTypeValue(key: any) { let val = ""; if (key === "2") { val = "人员数量异常"; - }else if(key === "3"){ + } else if (key === "3") { val = "陌生人告警"; - }else{ + } else { val = key; } return val; @@ -187,12 +188,12 @@ const AbnormalAalarm: React.FC<{}> = () => { /> {viewDetailModalVisible ? ( - setViewDetailModalVisible(false)} - onOk={()=>{}} + onOk={() => { }} > ) : null diff --git a/src/pages/AbnormalAlarm/service.ts b/src/pages/ElecEvaluation/AbnormalAlarm/service.ts similarity index 100% rename from src/pages/AbnormalAlarm/service.ts rename to src/pages/ElecEvaluation/AbnormalAlarm/service.ts diff --git a/src/pages/AppointmentManage/index.tsx b/src/pages/ElecEvaluation/AppointmentManage/index.tsx similarity index 99% rename from src/pages/AppointmentManage/index.tsx rename to src/pages/ElecEvaluation/AppointmentManage/index.tsx index 84d449b..5a7876b 100644 --- a/src/pages/AppointmentManage/index.tsx +++ b/src/pages/ElecEvaluation/AppointmentManage/index.tsx @@ -192,7 +192,7 @@ export default () => { } //查看预约详情跳转 const viewMeetContent = () => { - window.open("/ElecEvalReserve"); + window.open("/ElecEvaluation/ElecEvalReserve"); } useEffect(() => { diff --git a/src/pages/AppointmentManage/service.ts b/src/pages/ElecEvaluation/AppointmentManage/service.ts similarity index 100% rename from src/pages/AppointmentManage/service.ts rename to src/pages/ElecEvaluation/AppointmentManage/service.ts diff --git a/src/pages/Device/DeviceForm.tsx b/src/pages/ElecEvaluation/Device/DeviceForm.tsx similarity index 100% rename from src/pages/Device/DeviceForm.tsx rename to src/pages/ElecEvaluation/Device/DeviceForm.tsx diff --git a/src/pages/Device/index.tsx b/src/pages/ElecEvaluation/Device/index.tsx similarity index 100% rename from src/pages/Device/index.tsx rename to src/pages/ElecEvaluation/Device/index.tsx diff --git a/src/pages/Device/service.ts b/src/pages/ElecEvaluation/Device/service.ts similarity index 100% rename from src/pages/Device/service.ts rename to src/pages/ElecEvaluation/Device/service.ts diff --git a/src/pages/ElecEvalReserve/index.tsx b/src/pages/ElecEvaluation/ElecEvalReserve/index.tsx similarity index 100% rename from src/pages/ElecEvalReserve/index.tsx rename to src/pages/ElecEvaluation/ElecEvalReserve/index.tsx diff --git a/src/pages/ElecEvalReserve/service.ts b/src/pages/ElecEvaluation/ElecEvalReserve/service.ts similarity index 100% rename from src/pages/ElecEvalReserve/service.ts rename to src/pages/ElecEvaluation/ElecEvalReserve/service.ts diff --git a/src/pages/EvalSiteManage/PersonReport/components/PersonReportModal.tsx b/src/pages/ElecEvaluation/EvalSiteManage/PersonReport/components/PersonReportModal.tsx similarity index 100% rename from src/pages/EvalSiteManage/PersonReport/components/PersonReportModal.tsx rename to src/pages/ElecEvaluation/EvalSiteManage/PersonReport/components/PersonReportModal.tsx diff --git a/src/pages/EvalSiteManage/PersonReport/index.tsx b/src/pages/ElecEvaluation/EvalSiteManage/PersonReport/index.tsx similarity index 100% rename from src/pages/EvalSiteManage/PersonReport/index.tsx rename to src/pages/ElecEvaluation/EvalSiteManage/PersonReport/index.tsx diff --git a/src/pages/EvalSiteManage/PersonReport/service.ts b/src/pages/ElecEvaluation/EvalSiteManage/PersonReport/service.ts similarity index 100% rename from src/pages/EvalSiteManage/PersonReport/service.ts rename to src/pages/ElecEvaluation/EvalSiteManage/PersonReport/service.ts diff --git a/src/pages/EvalSiteManage/SitePerson/components/SitePersonModal.tsx b/src/pages/ElecEvaluation/EvalSiteManage/SitePerson/components/SitePersonModal.tsx similarity index 100% rename from src/pages/EvalSiteManage/SitePerson/components/SitePersonModal.tsx rename to src/pages/ElecEvaluation/EvalSiteManage/SitePerson/components/SitePersonModal.tsx diff --git a/src/pages/EvalSiteManage/SitePerson/index.tsx b/src/pages/ElecEvaluation/EvalSiteManage/SitePerson/index.tsx similarity index 100% rename from src/pages/EvalSiteManage/SitePerson/index.tsx rename to src/pages/ElecEvaluation/EvalSiteManage/SitePerson/index.tsx diff --git a/src/pages/EvalSiteManage/SitePerson/service.ts b/src/pages/ElecEvaluation/EvalSiteManage/SitePerson/service.ts similarity index 100% rename from src/pages/EvalSiteManage/SitePerson/service.ts rename to src/pages/ElecEvaluation/EvalSiteManage/SitePerson/service.ts diff --git a/src/pages/MonitorScreen/Home/china.js b/src/pages/ElecEvaluation/MonitorScreen/Home/china.js similarity index 100% rename from src/pages/MonitorScreen/Home/china.js rename to src/pages/ElecEvaluation/MonitorScreen/Home/china.js diff --git a/src/pages/MonitorScreen/Home/index.tsx b/src/pages/ElecEvaluation/MonitorScreen/Home/index.tsx similarity index 99% rename from src/pages/MonitorScreen/Home/index.tsx rename to src/pages/ElecEvaluation/MonitorScreen/Home/index.tsx index 4683f0c..a8b6d42 100644 --- a/src/pages/MonitorScreen/Home/index.tsx +++ b/src/pages/ElecEvaluation/MonitorScreen/Home/index.tsx @@ -113,7 +113,7 @@ export const LocalTime = () => { } const projectClick = () => { - history.push("/MonitorScreen/MonitorRoom"); + history.push("/ElecMonitorScreen/MonitorRoom"); } const GraphChart = (props: { type: string, chartData: any[] }) => { const { type, chartData } = props; diff --git a/src/pages/MonitorScreen/Home/service.ts b/src/pages/ElecEvaluation/MonitorScreen/Home/service.ts similarity index 100% rename from src/pages/MonitorScreen/Home/service.ts rename to src/pages/ElecEvaluation/MonitorScreen/Home/service.ts diff --git a/src/pages/MonitorScreen/Home/style.less b/src/pages/ElecEvaluation/MonitorScreen/Home/style.less similarity index 100% rename from src/pages/MonitorScreen/Home/style.less rename to src/pages/ElecEvaluation/MonitorScreen/Home/style.less diff --git a/src/pages/MonitorScreen/MonitorRoom/index.tsx b/src/pages/ElecEvaluation/MonitorScreen/MonitorRoom/index.tsx similarity index 99% rename from src/pages/MonitorScreen/MonitorRoom/index.tsx rename to src/pages/ElecEvaluation/MonitorScreen/MonitorRoom/index.tsx index 3d67148..d8644f9 100644 --- a/src/pages/MonitorScreen/MonitorRoom/index.tsx +++ b/src/pages/ElecEvaluation/MonitorScreen/MonitorRoom/index.tsx @@ -149,7 +149,7 @@ const itemRender: PaginationProps['itemRender'] = (_, type, originalElement) => return originalElement; }; export const homeClick = () => { - history.push("/MonitorScreen/Home"); + history.push("/ElecMonitorScreen/Home"); } export const previousClick = () => { history.goBack(); @@ -210,7 +210,7 @@ export default () => { return; } history.push({ - pathname: "/MonitorScreen/ProjectMonitorRoom", + pathname: "/ElecMonitorScreen/ProjectMonitorRoom", state: { monitorId: item.id }, }) } diff --git a/src/pages/MonitorScreen/MonitorRoom/service.ts b/src/pages/ElecEvaluation/MonitorScreen/MonitorRoom/service.ts similarity index 100% rename from src/pages/MonitorScreen/MonitorRoom/service.ts rename to src/pages/ElecEvaluation/MonitorScreen/MonitorRoom/service.ts diff --git a/src/pages/MonitorScreen/MonitorRoom/style.less b/src/pages/ElecEvaluation/MonitorScreen/MonitorRoom/style.less similarity index 100% rename from src/pages/MonitorScreen/MonitorRoom/style.less rename to src/pages/ElecEvaluation/MonitorScreen/MonitorRoom/style.less diff --git a/src/pages/MonitorScreen/ProjectMonitorRoom/index.tsx b/src/pages/ElecEvaluation/MonitorScreen/ProjectMonitorRoom/index.tsx similarity index 100% rename from src/pages/MonitorScreen/ProjectMonitorRoom/index.tsx rename to src/pages/ElecEvaluation/MonitorScreen/ProjectMonitorRoom/index.tsx diff --git a/src/pages/MonitorScreen/ProjectMonitorRoom/service.ts b/src/pages/ElecEvaluation/MonitorScreen/ProjectMonitorRoom/service.ts similarity index 100% rename from src/pages/MonitorScreen/ProjectMonitorRoom/service.ts rename to src/pages/ElecEvaluation/MonitorScreen/ProjectMonitorRoom/service.ts diff --git a/src/pages/MonitorScreen/ProjectMonitorRoom/style.less b/src/pages/ElecEvaluation/MonitorScreen/ProjectMonitorRoom/style.less similarity index 100% rename from src/pages/MonitorScreen/ProjectMonitorRoom/style.less rename to src/pages/ElecEvaluation/MonitorScreen/ProjectMonitorRoom/style.less diff --git a/src/pages/VideoMonitor/Online/components/OnlineSupervision.tsx b/src/pages/ElecEvaluation/VideoMonitor/Online/components/OnlineSupervision.tsx similarity index 95% rename from src/pages/VideoMonitor/Online/components/OnlineSupervision.tsx rename to src/pages/ElecEvaluation/VideoMonitor/Online/components/OnlineSupervision.tsx index d2d1d28..6c89356 100644 --- a/src/pages/VideoMonitor/Online/components/OnlineSupervision.tsx +++ b/src/pages/ElecEvaluation/VideoMonitor/Online/components/OnlineSupervision.tsx @@ -32,7 +32,7 @@ const OnlineSupervision: React.FC<{}> = () => { //在线监督 function supervision(record: any): void { - window.open("/MonitorScreen/ProjectMonitorRoom?monitorId=" + record.id); + window.open("/ElecMonitorScreen/ProjectMonitorRoom?monitorId=" + record.id); } const columns: ProColumns[] = [ @@ -168,8 +168,8 @@ const OnlineSupervision: React.FC<{}> = () => { }).finally(() => { isNotEmpty(window.location.search) && history.push(window.location.pathname); spinSet(false); - }) - } + }) + } } pagination={{ defaultPageSize: 10, @@ -184,7 +184,7 @@ const OnlineSupervision: React.FC<{}> = () => { rowKey={"id"} /> - closeViewDetails()} ref = {viewModalRef}/> + closeViewDetails()} ref={viewModalRef} /> ) } diff --git a/src/pages/VideoMonitor/Online/components/ReservedItems.tsx b/src/pages/ElecEvaluation/VideoMonitor/Online/components/ReservedItems.tsx similarity index 100% rename from src/pages/VideoMonitor/Online/components/ReservedItems.tsx rename to src/pages/ElecEvaluation/VideoMonitor/Online/components/ReservedItems.tsx diff --git a/src/pages/VideoMonitor/Online/index.tsx b/src/pages/ElecEvaluation/VideoMonitor/Online/index.tsx similarity index 100% rename from src/pages/VideoMonitor/Online/index.tsx rename to src/pages/ElecEvaluation/VideoMonitor/Online/index.tsx diff --git a/src/pages/VideoMonitor/Online/service.ts b/src/pages/ElecEvaluation/VideoMonitor/Online/service.ts similarity index 100% rename from src/pages/VideoMonitor/Online/service.ts rename to src/pages/ElecEvaluation/VideoMonitor/Online/service.ts diff --git a/src/pages/VideoMonitor/Post/index.tsx b/src/pages/ElecEvaluation/VideoMonitor/Post/index.tsx similarity index 95% rename from src/pages/VideoMonitor/Post/index.tsx rename to src/pages/ElecEvaluation/VideoMonitor/Post/index.tsx index 05d7ac6..57c761a 100644 --- a/src/pages/VideoMonitor/Post/index.tsx +++ b/src/pages/ElecEvaluation/VideoMonitor/Post/index.tsx @@ -34,7 +34,7 @@ const PostSupervision: React.FC<{}> = () => { //评标监控回看 function reviewMonitor(record: any): void { - window.open("/MonitorScreen/ProjectMonitorRoom?monitorId=" + record.id); + window.open("/ElecMonitorScreen/ProjectMonitorRoom?monitorId=" + record.id); } const columns: ProColumns[] = [ @@ -170,8 +170,8 @@ const PostSupervision: React.FC<{}> = () => { }).finally(() => { isNotEmpty(window.location.search) && history.push(window.location.pathname); spinSet(false); - }) - } + }) + } } pagination={{ defaultPageSize: 10, @@ -186,7 +186,7 @@ const PostSupervision: React.FC<{}> = () => { rowKey={"id"} /> - closeViewDetails()} ref = {viewModalRef}/> + closeViewDetails()} ref={viewModalRef} /> ) } diff --git a/src/pages/VideoMonitor/ViewModal.tsx b/src/pages/ElecEvaluation/VideoMonitor/ViewModal.tsx similarity index 100% rename from src/pages/VideoMonitor/ViewModal.tsx rename to src/pages/ElecEvaluation/VideoMonitor/ViewModal.tsx diff --git a/src/pages/VideoMonitor/service.ts b/src/pages/ElecEvaluation/VideoMonitor/service.ts similarity index 100% rename from src/pages/VideoMonitor/service.ts rename to src/pages/ElecEvaluation/VideoMonitor/service.ts