Skip to content

C
CivManage
Commit 8245a0d8 authored by 邓超's avatar 邓超
Browse files
Options

Merge branch 'master' of https://g.civnet.cn:8443/ReactWeb5/maintenance

parents 4a1f6436 02a996ea
Hide whitespace changes
Inline Side-by-side
Showing with 134 additions and 33 deletions
.env
View file @ 8245a0d8
# PUBLIC_PATH = reactOMS, 默认转发 /cityinterface
PROXY=/Cityinterface:http://192.168.19.105:8049;/PandaOMS:http://192.168.19.105:8049;/Web4:http://192.168.19.105:8049;/CityTemp:http://192.168.19.105:8049
PROXY=/Cityinterface:http://192.168.12.116:8015;/PandaOMS:http://192.168.12.116:8015;/Publish:http://192.168.12.116:8015;/Web4:http://192.168.19.105:8049;/CityTemp:http://192.168.19.105:8049
# PROXY=/Cityinterface:http://192.168.12.121:8082;/PandaOMS:http://192.168.12.121:8082;/Web4:http://192.168.12.121:8082;/CityTemp:http://192.168.12.121:8082
# 可设置第二个代理，test为转发前缀，后面为代理转发的地址
# PROXY2 = test : http://localhost:8006/
# 本地应用启动的host域名
HOST = 0.0.0.0
HOST = 192.168.12.192
# 本地应用启动的端口
PORT = 3001
src/pages/database/ManagementDataBase/ManagementDataBase.jsx
View file @ 8245a0d8
......@@ -20,7 +20,7 @@ import {
databaseStandardGetLog,
databaseStandardGetLogNew,
} from '@/services/database/api';
import { ConsoleSqlOutlined } from '@ant-design/icons';
import { CheckSquareFilled, ConsoleSqlOutlined } from '@ant-design/icons';
const ManagementDataBase = () => {
const [autoCheckList, setAutoCheckList] = useState([]); // 自动列表
......@@ -35,6 +35,8 @@ const ManagementDataBase = () => {
const [modalTitle, setModalTitle] = useState('详细信息');
const [currentPage, setCurrentPage] = useState(1);
const [pageSize, setPageSize] = useState(10);
const [checkSql, setCheckSql] = useState('');
const [sqlVisible, setSqlVisible] = useState(false);
// 检查数据库表
useEffect(() => {
setCheckLoading(true);
......@@ -227,15 +229,24 @@ const ManagementDataBase = () => {
title: '差异比较',
dataIndex: 'Message',
key: 'Message',
width: 400,
ellipsis: true,
},
{
title: 'SQL语句',
dataIndex: 'DiffSql',
key: 'DiffSql',
render: text => (
<Button size="small" type="primary" onClick={() => copySql(text)}>
复制SQL
render: (text, record) => (
<Button
size="small"
type="primary"
onClick={() => {
// copySql(text);
check(record);
setSqlVisible(true);
}}
>
查看SQL
</Button>
),
},
......@@ -340,6 +351,10 @@ const ManagementDataBase = () => {
setPageSize(pageSizes);
};
const check = e => {
console.log(e);
setCheckSql(e);
};
return (
<>
<PageContainer>
......@@ -423,6 +438,29 @@ const ManagementDataBase = () => {
>
{content}
</Modal>
<Modal
title={checkSql.TableName}
visible={sqlVisible}
maskClosable
onOk={() => setSqlVisible(false)}
onCancel={() => setSqlVisible(false)}
width="500px"
bodyStyle={{
minHeight: '100px',
overflowY: 'scroll',
}}
style={{ top: '40px' }}
footer={[
<Button type="primary" onClick={() => copySql(checkSql.DiffSql)}>
复制SQL
</Button>,
<Button type="primary" onClick={() => setSqlVisible(false)} key="back">
关闭窗口
</Button>,
]}
>
{checkSql.DiffSql}
</Modal>
</>
);
};
......
src/pages/platformCenter/videoManager/AddModal.jsx
View file @ 8245a0d8
/* eslint-disable default-case */
import React, { useEffect, useState } from 'react';
import { Form, Modal, Row, Col, Input, Select, notification } from 'antd';
import { addInsertVideoConfig, editInsertVideoConfig } from '@/services/videoManger/videoManger';
......
src/pages/platformCenter/videoManager/index.jsx
View file @ 8245a0d8
......@@ -32,6 +32,8 @@ import { GetVideoConfigList, deleteInsertVideoConfig } from '@/services/videoMan
import AddModal from './AddModal';
import CheckModal from './CheckModal';
import VideoModal from './VideoModal';
import DHModal from './DHModal';
import HKModal from './HKModal';
const videoManager = () => {
const [configurationType, setConfigurationType] = useState('1');
......@@ -49,6 +51,8 @@ const videoManager = () => {
const [obj, setObj] = useState({});
const [show1, setShow1] = useState('block');
const [show2, setShow2] = useState('none');
const [addDHVisible, setAddDHVisible] = useState(false);
const [addHKVisible, setAddHKVisible] = useState(false);
const [showSearchStyle, setShowSearchStyle] = useState(false); // 是否显示模糊查询样式
const columns = [
......@@ -234,7 +238,14 @@ const videoManager = () => {
};
const edit = record => {
setAddVisible(true);
if (type == '大华') {
setAddDHVisible(true);
} else if (type == '海康ISC') {
setAddHKVisible(true);
} else {
setAddVisible(true);
}
setKind('edit');
setObj(record);
};
......@@ -340,6 +351,12 @@ const videoManager = () => {
setType('海康NVR');
setType1('aa');
break;
case '5':
setType('大华');
break;
case '6':
setType('海康ISC');
break;
}
};
......@@ -372,11 +389,22 @@ const videoManager = () => {
// 新增
const addVideo = () => {
setAddVisible(true);
console.log(type);
if (type == '大华') {
setAddDHVisible(true);
} else if (type == '海康ISC') {
console.log(1212);
setAddHKVisible(true);
} else {
setAddVisible(true);
}
setKind('add');
};
const onSubmit = () => {
setAddDHVisible(false);
setAddHKVisible(false);
setAddVisible(false);
setFlag(flag + 1);
};
......@@ -395,6 +423,8 @@ const videoManager = () => {
<Option value="2">海康</Option>
<Option value="3">海康1.2</Option>
<Option value="4">海康NVR</Option>
<Option value="5">大华</Option>
<Option value="6">海康ISC</Option>
</Select>
<span style={{ marginLeft: '50px' }}>快速搜索：</span>
<Search
......@@ -509,6 +539,30 @@ const videoManager = () => {
}}
obj={obj}
/>
<DHModal
visible={addDHVisible}
onCancel={() => {
setAddDHVisible(false);
}}
okText="确认"
cancelText="取消"
type={type}
kind={kind}
obj={obj}
callBackSubmit={onSubmit}
/>
<HKModal
visible={addHKVisible}
onCancel={() => {
setAddHKVisible(false);
}}
okText="确认"
cancelText="取消"
type={type}
kind={kind}
obj={obj}
callBackSubmit={onSubmit}
/>
</div>
);
};
......
src/routes/config.js
View file @ 8245a0d8
......@@ -29,7 +29,7 @@ import SiteManage from '@/pages/userCenter/siteManage/SiteManage';
import Dictionary from '@/pages/dataCenter/dictionary';
// 组态平台
import BaseFrameContainer from '@/components/BaseFrameContainer';
// 平台中心
import SchemeConfig from '@/pages/platformCenter/gis/schemeConfig/SchemeConfig';
import DimensionsConfig from '@/pages/platformCenter/gis/dimensionsConfig/dimensionsConfig';
......@@ -37,6 +37,7 @@ import MessageManager from '@/pages/platformCenter/messageManage';
import SchemeDetail from '@/pages/platformCenter/messageManage/schemeDetail/schemeDetail';
import HostManager from '@/pages/platformCenter/hostmanager';
import VideoManager from '@/pages/platformCenter/videoManager';
import BaseFrameContainer from '@/pages/platformCenter/baseFrameContainer';
// 业务中心
import TableManager from '@/pages/bsmanager/base/tablemanager';
import FiledConfig from '@/pages/bsmanager/base/tablemanager/filedConfig/filedConfig';
......@@ -183,29 +184,6 @@ export default {
// },
// ],
},
// {
// path: '/platformCenter/iot',
// name: '组态平台',
// component: BaseFrameContainer,
// tabs: [
// {
// tabName: '模型类型',
// url:
// '/web4/?widget=configuration/ConfigurationsOperationV1/ModelTypeManage/ModelTypeManage|hideMap=true',
// },
// {
// tabName: '模型文件',
// url:
// '/web4/?widget=configuration/ConfigurationsOperationV1/ModelFileManage/ModelFileManage|hideMap=true',
// },
// {
// tabName: '画板管理',
// url:
// '/web4/?widget=configuration/ConfigurationsOperationV1/DrawBoardManage/DrawBoardManage|hideMap=true',
// },
// ],
// },
{
path: '/platformCenter/notify',
name: '消息平台',
......@@ -229,6 +207,28 @@ export default {
name: '视频平台',
component: VideoManager,
},
{
path: '/platformCenter/iot',
name: '组态平台',
component: BaseFrameContainer,
// tabs: [
// {
// tabName: '模型类型',
// url:
// '/web4/?widget=configuration/ConfigurationsOperationV1/ModelTypeManage/ModelTypeManage|hideMap=true',
// },
// {
// tabName: '模型文件',
// url:
// '/web4/?widget=configuration/ConfigurationsOperationV1/ModelFileManage/ModelFileManage|hideMap=true',
// },
// {
// tabName: '画板管理',
// url:
// '/web4/?widget=configuration/ConfigurationsOperationV1/DrawBoardManage/DrawBoardManage|hideMap=true',
// },
// ],
},
],
},
{
......
src/services/index.js
View file @ 8245a0d8
/*
* @Description:
* @Author: leizhe
* @Date: 2021-12-23 17:51:09
* @LastEditTime: 2022-04-14 11:04:59
* @LastEditors: leizhe
*/
import { request } from '../utils/request';
const CITY_SERVICE = '/Cityinterface/rest/services';
// export const CITY_SERVICE = '/Publish/GateWay/CityServer';
const PUBLISH_SERVICE = '/PandaOMS/OMS';
// export const PUBLISH_SERVICE = '/Publish/GateWay/OMS';
const WebSERVICE = '/Publish/Web';
const get = async (url, params, options = {}) =>
request({
url,
......@@ -26,4 +34,4 @@ const postForm = async (url, params = {}, options = {}) => {
return post(url, formData, options);
};
export { get, post, postForm, CITY_SERVICE, PUBLISH_SERVICE };
export { get, post, postForm, CITY_SERVICE, PUBLISH_SERVICE, WebSERVICE };
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment